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

skyouc

7 天以前 18b35f1400df83e20a870dbfd7e97ae9ca277cbd

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java

@@ -13,10 +13,13 @@

    User getByUsername(String username, Long tenantId);

    User getByIdRel(Long userId);
    User getByEmail(String email, Long tenantId);

    User setUserAuthInfo(User user);

    boolean comparePassword(String dbPassword, String inputPassword);

    String encodePassword(String password);

    User selectByUsernameWithoutTenant(String username, Long tenantId);
}