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

huanghongfa

2021-08-06 add39a5a140ca34752dc8f91a1b7f8f3b8185b72

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

@@ -134,6 +134,15 @@
     */
    R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId);

    /**
     * 批量导入服刑人员
     *
     * @param list        服刑人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId);


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