Merge branch 'test' into 'test_wangge_two'

罗元桥

2021-06-23 72f11c9e9edec3d2534112badf7a0ca48fa9da5a

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

@@ -757,4 +757,7 @@
     */
    @PostMapping("gridMemberEditStatus")
    R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);

    @GetMapping("big/no/tip")
    R noTips(@RequestParam("userId") Long userId);
}