Merge remote-tracking branch 'origin/rcs_master' into rcs_master

zhangc

8 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/UserService.java

@@ -19,4 +19,6 @@

    String encodePassword(String password);

    User setUserAuthInfo(User user);

}