Merge branch 'rcs_master' into ctu_conveyor

zhang

7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 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);

}