Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -468,8 +468,10 @@
     * @return 党建活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
        return comBpActivityService.listActivity(userId, communityId);
    public R listActivity(@RequestParam("userId") Long userId,
                          @RequestParam("communityId") Long communityId,
                          @RequestParam(value = "status", required = false) Integer status) {
        return comBpActivityService.listActivity(userId, communityId, status);

    }