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

lidongdong

2022-09-26 2ebd707749baac527ef501a531467245e3dd5cdd

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

}