Merge branch 'test' into 'master'

罗元桥

2021-07-15 2b020ad1e07a91524b496069e1a604b92ebbd7a3

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

@@ -325,7 +325,7 @@
     * @return 协议集合
     */
    @PostMapping("listagreement")
    R listAgreement();
    R listAgreement(@RequestParam("communityId")Long communityId);

    /**
     * 编辑用户协议
@@ -760,4 +760,15 @@

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

    /**
     * 查询社区的收益说明
     * @param communityId   社区id
     * @return  收益说明
     */
    @PostMapping("listagreements")
    R listAgreements(@RequestParam("communityId")Long communityId);

    @PostMapping("user/getUserGrids")
    R getGridIsOk(@RequestParam("userId")Long userId);
}