Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -467,4 +467,6 @@
     * @return  收益说明
     */
    R listAgreements(Long communityId);

    R getGridIsOk(Long userId);
}