Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2026-01-04 0eb444f93724d63d4bf4d18e5bd120ec86bf8c22

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -148,4 +148,13 @@
     * @return 结果
     */
    public SysUser checkEmailUnique(String email);


    /**
     * 匹配邮箱
     * @param nickName 用户账号名
     * @param email 用户邮箱
     * @return 结果
     */
    SysUser checkEmail(@Param("nickName") String nickName,@Param("email") String email);
}