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

tangxiaobao

2021-08-05 d769a8683ea6f2ecbc451da71ca3079c6765a99d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -369,6 +369,19 @@
    }

    /**
     * 批量导入邪教人员
     *
     * @param list        邪教人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("population/importCult")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId){
        return comMngPopulationService.listSaveCultPopulation(list, communityId);
    }

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息