From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 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 e059d03..69f6277 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
@@ -18,8 +18,13 @@
 import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
 import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
+import com.panzhihua.common.model.vos.user.ComMngTagVO;
 import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -143,6 +148,27 @@
     R deleteSpecialInputUser(Long id);
 
     /**
+     * 基础数据》特殊群体》分页查询标签列表
+     * @param comMngUserTagDTO
+     * @return
+     */
+    R specialInputUserTags(PageInputUserDTO comMngUserTagDTO);
+
+    /**
+     * 新增或修改特殊群体标签
+     * @param comMngTagVO
+     * @return
+     */
+    R saveSpecialInputUserTags(ComMngTagVO comMngTagVO);
+
+    /**
+     * 删除特殊群体标签
+     * @param id
+     * @return
+     */
+    R deleteSpecialInputUserTags(Long id);
+
+    /**
      * 查询实有人口电子档信息
      *
      * @param populationId 实有人口id

--
Gitblit v1.7.1