Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-04 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052

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

@@ -107,6 +107,15 @@
     */
    R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId);

    /**
     * 批量导入邪教人员
     *
     * @param list        邪教人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId);


    /**
     * 确认导入实有人口（有则更新，无则新建）