Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2bff00bae9369d70d29acde8fea1fd8192ada033

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -963,5 +963,10 @@
        return userService.gridMemberEditStatus(gridMemberEditDTO);
    }

    @GetMapping("big/no/tip")
    public R noTips(@RequestParam("userId") Long userId){
        return userService.noTips(userId);
    }


}