Merge branch 'pxb' into xin

xin

17 hours ago d3563f0bdb487124d79cdd20d0f8bfc79db31f24

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