Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

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