Merge branch 'master' into xin

xin

2025-07-21 548bead175143ab846aaf0816f2ff1129050e94a

 oying-system/src/main/java/com/oying/modules/system/service/UserService.java

@@ -123,4 +123,5 @@
     */
    void resetPwd(Set<Long> ids, String pwd);

    void updateRiderOpenId(User user1);
}