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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

@@ -162,6 +162,14 @@
    R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId);

    /**
     * 批量导入低保户
     *
     * @param list        低保户数据
     * @param communityId 社区id
     * @return 导入结果
     */
    R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId);
    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息