Merge branch 'rcs_master' into ctu_conveyor

zhang

2026-01-28 a9cf56a7be8b5e27e2c3dcb416b734093e7a8dc3

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

}