Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

yangyang

2025-03-21 632bb5a9a0f07c01ffba53e9009d69c4a50c2bd7

 rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/UserMapper.java

@@ -18,6 +18,9 @@
    List<User> selectPageRel(@Param("page") IPage<User> page, @Param("param") Map<String, Object> param);

    @InterceptorIgnore(tenantLine = "true")
    User selectByUsername(@Param("username") String username, @Param("tenantId") Long tenantId);
    User selectByUsernameWithoutTenant(@Param("username") String username, @Param("tenantId") Long tenantId);

    @InterceptorIgnore(tenantLine = "true")
    User selectByEmailWithoutTenant(@Param("email") String email, @Param("tenantId") Long tenantId);

}