From 70406a52ed3bd31fb72793dea750793ca216193a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 23 八月 2021 19:34:10 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 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 20c0ca5..e9a9b92 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,5 +1,7 @@
 package com.panzhihua.service_user.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
 import com.panzhihua.common.model.dtos.community.ExportUserDTO;
@@ -7,14 +9,10 @@
 import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
 import com.panzhihua.common.model.dtos.user.InputUserTagsDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.user.ComMngTagVO;
 import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
-import com.panzhihua.common.model.vos.user.InputUserInfoVO;
 import com.panzhihua.service_user.model.dos.SysUserInputDO;
-
-import java.util.List;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,20 +23,27 @@
 public interface SysUserInputService extends IService<SysUserInputDO> {
     /**
      * 批量导入居民用户
-     * @param list 居民用户集合
-     * @param areaName 小区名字
+     * 
+     * @param list
+     *            居民用户集合
+     * @param areaName
+     *            小区名字
      * @return 导入结果
      */
     R batchSaveUser(List<EexcelUserDTO> list, StringBuffer areaName);
+
     /**
      * 社区人员详情包括导入人员
-     * @param userId 人员id
+     * 
+     * @param userId
+     *            人员id
      * @return CommunityUserInfoVO
      */
     CommunityUserInfoVO detailUserComunity(Long userId);
 
     /**
      * 分页查询居民数据
+     * 
      * @param pageInputUserDTO
      * @return
      */
@@ -46,6 +51,7 @@
 
     /**
      * 设置标签
+     * 
      * @param inputUserTagsDTO
      * @return
      */
@@ -53,6 +59,7 @@
 
     /**
      * 导出居民信息
+     * 
      * @param exportUserDTO
      * @return
      */
@@ -60,6 +67,7 @@
 
     /**
      * 居民详情
+     * 
      * @param id
      * @return
      */
@@ -67,6 +75,7 @@
 
     /**
      * 查询特殊群体
+     * 
      * @param pageInputUserDTO
      * @return
      */
@@ -74,6 +83,7 @@
 
     /**
      * 特殊群体标签
+     * 
      * @param comMngUserTagDTO
      * @return
      */
@@ -81,6 +91,7 @@
 
     /**
      * 新增或修改特殊群体标签
+     * 
      * @param comMngTagVO
      * @return
      */
@@ -88,12 +99,15 @@
 
     /**
      * 删除特殊群体标签
+     * 
      * @param id
      * @return
      */
     R deleteSpecialInputUserTags(Long id);
+
     /**
      * 删除特殊群体用户
+     * 
      * @param id
      * @return
      */
@@ -101,10 +115,10 @@
 
     /**
      * 导出特殊群体用户
+     * 
      * @param exportSpecialUserDTO
      * @return
      */
     R specialUserExport(ExportSpecialUserDTO exportSpecialUserDTO);
-
 
 }

--
Gitblit v1.7.1