Merge branch 'hemenkou_dev' into dev

101captain

2022-03-09 9c5b811fb700bc66e66dbf38ed8733e57a4edac6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -312,4 +313,18 @@
     * @return
     */
    R partyMemberCount(Long communityId,String year);

    /**
     * 党员活动个人统计
     * @param commonPage
     * @return
     */
    R partyMemberDetail(CommonPage commonPage);

    /**
     *导出党员活动
     * @param commonPage
     * @return
     */
    R exportPartyMemberDetail(CommonPage commonPage);
}