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

lidongdong

2022-09-23 1b6430587fcf72e58510a32f7e6c88bda565f62e

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

@@ -1277,6 +1277,6 @@


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

}