From bfae897ebaea752b489ee92777043b9f83cfe736 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 29 六月 2021 11:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 ec4e3e0..f10e3cd 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
@@ -20,6 +20,7 @@
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
 import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
 import com.panzhihua.common.model.dtos.neighbor.*;
 import com.panzhihua.common.model.dtos.neighbor.*;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
@@ -3141,4 +3142,12 @@
      */
     @PostMapping("/wallet/get/ranking")
     R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+    /**
+     * 综治后台-居民列表
+     * @param populationListDTO 请求参数
+     * @return  居民列表
+     */
+    @PostMapping("/population/grid/list")
+    R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
 }

--
Gitblit v1.7.1