Merge branch 'master' into 'test'

罗元桥

2021-07-24 f3c4034ebbed90f57f7ab5cc173bea115fe91b05

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -469,4 +469,6 @@
    R listAgreements(Long communityId);

    R getGridIsOk(Long userId);

    R getGridsMemberList(Long communityId);
}