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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9475,4 +9475,20 @@
     */
    @PostMapping("/screen/fourMember/resolve")
    R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员院落议事展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/courtyard/list")
    R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-院落议事
     * @param communityId
     * @return
     */
    @GetMapping("/screen/courtyard/base")
    R getCourtyardBaseData(@RequestParam("communityId") Long communityId);
}