Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-27 e11e6f0751222b1a6dd356bf54ead9e597c9c2ea

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1286,4 +1286,9 @@
     * */
    @GetMapping("/sanshuoResetPassword")
    R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);


    @GetMapping("/accept")
     R accept(@RequestParam("userId")Long userId);

}