Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

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

@@ -53,5 +53,25 @@
     */
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id);

    /**
     * 导出
     * @param lis
     * @param communityId
     * @return
     */
    R export(List<ComActSocialWorkerExcelVO> lis, Long communityId);

    /**
     * 查询活动社工
     * @param commonPage
     * @return
     */
    R activity(CommonPage commonPage);

    /**
     * 根据社工查询活动
     * @param commonPage
     * @return
     */
    R activityList(CommonPage commonPage);
}