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/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 13 +++++++++++--
1 files changed, 11 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..d6061e1 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,8 @@
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.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 +79,6 @@
* @return 导入结果
*/
R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId);
-
/**
* 根据实有人口id修改用户标签
*
@@ -177,7 +178,7 @@
* @return 统计结果
*/
R getScreenCivil(Long communityId);
-
+
/**
* description 根据身份证信息修改用户标签信息
*
@@ -208,4 +209,12 @@
R getScreenGirds(Long communityId);
R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);
+
+ R pagePopulationListApp(PagePopulationListDTO populationListDTO);
+
+ R getPopulationDetailApp(Long populationId);
+
+ R getPopulationRepairByApp();
+
+ R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);
}
--
Gitblit v1.7.1