Merge remote-tracking branch 'origin/master'

huanghongfa

2021-03-30 c4d6c6cc7f6a2342cc32e7f67f6f6eeb76a97ac1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1573,15 +1573,17 @@

    /**
     * 批量导入实有人口
     *
     * @param list
     * @param communityId
     * @return
     */
    @PostMapping("/population/import")
    R listSavePopulationServeExcelVO(List<ComMngPopulationServeExcelVO> list,@RequestParam(value = "communityId")  Long communityId);
    @PostMapping("/common/data/population/import")
    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 分页查询实有人口
     *
     * @param comMngPopulationVO 查询参数
     * @return 分页集合
     */
@@ -1590,6 +1592,7 @@

    /**
     * 根据id实有人口详细信息
     *
     * @param populationId 实有人口id
     * @return 实有人口详细信息
     */
@@ -1598,6 +1601,7 @@

    /**
     * 根据id修改实有人口标签列表
     *
     * @param populationTagDTO 请求参数
     * @return 修改结果
     */