From e75b4aa72e9f260912a96a9bc36b58f9985862b0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:13:15 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
index b8d1155..7cb19a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -5,6 +5,10 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -77,7 +81,6 @@
* @return 导入结果
*/
R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId);
-
/**
* 根据实有人口id修改用户标签
*
@@ -177,7 +180,7 @@
* @return 统计结果
*/
R getScreenCivil(Long communityId);
-
+
/**
* description 根据身份证信息修改用户标签信息
*
@@ -208,4 +211,20 @@
R getScreenGirds(Long communityId);
R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);
+
+ R pagePopulationListApp(PagePopulationListDTO populationListDTO);
+
+ R getPopulationDetailApp(Long populationId);
+
+ R getPopulationRepairByApp();
+
+ R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);
+
+ R delGridPopulationAdmin(List<Long> ids);
+
+ R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);
+
+
+
+ R binding();
}
--
Gitblit v1.7.1