From bd563bebae7b472fadbf348ec85367bbda3f3193 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 30 三月 2021 10:32:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 7bbb3da..35ae1d1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1337,6 +1337,14 @@
@PostMapping("/common/data/car/import")
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
+ /**
+ * 分页查询实有人口
+ * @param comMngPopulationVO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/page")
+ R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
/**
* 社区后台实有单位管理列表
@@ -1558,6 +1566,6 @@
* @param communityId
* @return
*/
- /*@PostMapping("/village/import")
- R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam Long communityId);*/
+ @PostMapping("/village/import")
+ R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
}
--
Gitblit v1.7.1