Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 241408b071cb1b43d9307ae9c75c82bb77b6faa7

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

}