Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-14 d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe

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

@@ -249,11 +249,11 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @param ids
     *            实有人口id集合
     * @return 删除结果
     */
    R deletePopulations(List<Long> Ids);
    R deletePopulations(List<Long> ids, Long communityId);

    /**
     * 根据社区id查询所有实有人口
@@ -514,4 +514,21 @@
    R relationVillage(String name);

    R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);

    /**
     * 导出特殊人群
     * @param PageInputUserDTO
     * @return
     */
    R specialInputUserExport(PageInputUserDTO PageInputUserDTO);

    /**
     * 西区大屏治理数据
     * @return
     */
    R westScreenStatics();

    R getComprehensivePopulationStatics(Long streetId);

    R getComprehensiveStreetList();
}