Merge branch 'test_screen' into 'master'

罗元桥

2021-06-17 a7b550f95172e29d71aa38dca45cacf7f31949b8

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