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

zhang

2026-03-31 504930c323050e2a32d795392147e97edf7f2f03

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

}