From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:06 +0800
Subject: [PATCH] 解决代码被合并后删除问题

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java |   10 ++++++++--
 1 files changed, 8 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..f77a1d8 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,7 @@
 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.user.PageInputUserDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -77,7 +78,6 @@
      * @return 导入结果
      */
     R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId);
-
     /**
      * 根据实有人口id修改用户标签
      *
@@ -177,7 +177,7 @@
      * @return  统计结果
      */
     R getScreenCivil(Long communityId);
-	
+
 	/**
      * description 根据身份证信息修改用户标签信息
      *
@@ -208,4 +208,10 @@
     R getScreenGirds(Long communityId);
 
     R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);
+
+    R pagePopulationListApp(PagePopulationListDTO populationListDTO);
+
+    R getPopulationDetailApp(Long populationId);
+
+    R getPopulationRepairByApp();
 }

--
Gitblit v1.7.1