From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java
index d0221ac..20c0ca5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java
@@ -1,6 +1,7 @@
 package com.panzhihua.service_user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
 import com.panzhihua.common.model.dtos.community.ExportUserDTO;
 import com.panzhihua.common.model.dtos.user.ComMngUserTagDTO;
 import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
@@ -55,7 +56,7 @@
      * @param exportUserDTO
      * @return
      */
-    R export(ExportUserDTO exportUserDTO);
+    R exportInputUser(ExportUserDTO exportUserDTO);
 
     /**
      * 居民详情
@@ -86,9 +87,24 @@
     R saveSpecialInputUserTags(ComMngTagVO comMngTagVO);
 
     /**
+     * 删除特殊群体标签
+     * @param id
+     * @return
+     */
+    R deleteSpecialInputUserTags(Long id);
+    /**
      * 删除特殊群体用户
      * @param id
      * @return
      */
     R deleteSpecialInputUser(Long id);
+
+    /**
+     * 导出特殊群体用户
+     * @param exportSpecialUserDTO
+     * @return
+     */
+    R specialUserExport(ExportSpecialUserDTO exportSpecialUserDTO);
+
+
 }

--
Gitblit v1.7.1