Merge branch 'partyBuilding_lyq' into 'dev'

罗元桥

2022-03-02 e5e511ab41934c30015a42f46bd440cdc2c6b413

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

@@ -1148,7 +1148,7 @@
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 用户确认心愿
@@ -9332,4 +9332,12 @@

    @GetMapping("/activity/partyMemberCount")
    R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @GetMapping("/building/getBuildListByVillageId")
    R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
}