Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java

@@ -102,9 +102,10 @@
     *            用户id
     * @param communityId
     *            社区id
     * @param status
     * @return 党建活动列表
     */
    R listActivity(Long userId, Long communityId);
    R listActivity(Long userId, Long communityId, Integer status);

    /**
     * 党员活动人员参入列表