diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index fa86277ed..b668f8c31 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -256,7 +256,7 @@
                 <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index 0308dc940..6d68ee73c 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit 0308dc940b9fe23a8b4b20208cec7ac70643312e
+Subproject commit 6d68ee73c50f7aaa1a7d330ef8aef2758a176f8a
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
index 2cecfc131..cab7aa276 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
@@ -14,12 +14,12 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO;
 import com.elink.esua.epdc.service.ActUserRelationService;
 import com.elink.esua.epdc.service.AppUserService;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.utils.UserTagUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
index 1d72df447..01314a3f0 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
@@ -6,11 +6,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.StandardBearerStatusResultDTO;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@@ -18,6 +13,11 @@ import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
 import com.elink.esua.epdc.service.AppUserService;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
index 7125b57ff..e25d9ff68 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
@@ -11,11 +11,11 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.DeptOption;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
 import com.elink.esua.epdc.service.CustomService;
 import com.elink.esua.epdc.service.MessageService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java
index bdd74dce4..d1aca8b4e 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java
@@ -4,12 +4,12 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
 import com.elink.esua.epdc.service.GroupService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
index 65efa6191..c1e30ac47 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
@@ -12,6 +12,8 @@ import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
 import com.elink.esua.epdc.service.WorkUserService;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -169,11 +171,10 @@ public class ApiWorkUserController {
     }
 
     /**
-     *
      * 首页菜单消息数量显示
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO>>
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO>>
      * @author liuchuang
      * @since 2019/11/28 19:56
      */
@@ -198,37 +199,34 @@ public class ApiWorkUserController {
 
 
     /**
-    * @describe: 判断是否更新头像
-    * @author wangtong
-    * @date 2020/3/30 13:32
-    * @param []
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
-    */
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @describe: 判断是否更新头像
+     * @author wangtong
+     * @date 2020/3/30 13:32
+     */
     @GetMapping("checkUpdateAvatar")
     public Result checkUpdateAvatar() {
         return workUserService.checkUpdateAvatar();
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 更新头像
      * @author wangtong
      * @date 2020/3/30 16:11
-     * @param [avatar]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("updateAvatar")
     public Result updateAvatar(String avatar) {
         return workUserService.updateAvatar(avatar);
     }
 
-    
+
     /**
-    * @describe: 获得部门类型
-    * @author wangtong
-    * @date 2020/5/15 14:37
-    * @param [avatar]
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
-    */
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @describe: 获得部门类型
+     * @author wangtong
+     * @date 2020/5/15 14:37
+     */
     @GetMapping("getDeptTypeKey")
     public Result getDeptTypeKey(Long deptId) {
         return workUserService.getDeptTypeKey(deptId);
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java
index bb435c77b..98e706c87 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java
@@ -6,7 +6,6 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserRegisterFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserRegisterV3FormDTO;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java
index 20a5ff659..9c3d5e107 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java
@@ -2,12 +2,12 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
 import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index c0164ffe8..b52cf8b06 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -1,22 +1,19 @@
 package com.elink.esua.epdc.feign;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
 import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
-import org.apache.ibatis.annotations.Param;
+import com.elink.esua.epdc.user.dto.*;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
+
 
 /**
  * appuser端接口
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java
index 8b7102133..9e72b16c1 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java
@@ -3,12 +3,12 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
 import com.elink.esua.epdc.feign.GroupFeignClient;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
index 88429a7af..871b49ada 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
@@ -10,6 +10,9 @@ import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
 import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
+import com.elink.esua.epdc.user.dto.*;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java
index 4c09a9661..d3dca76ba 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java
@@ -1,12 +1,8 @@
 package com.elink.esua.epdc.listener;
 
 import com.alibaba.fastjson.JSONObject;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
-import com.elink.esua.epdc.feign.CustomFeignClient;
-import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.CustomService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
index e99c3cfa3..93000d363 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
@@ -3,13 +3,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.StandardBearerStatusResultDTO;
-import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
-import com.elink.esua.epdc.dto.UserPendingTrialResultDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
@@ -17,6 +11,11 @@ import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
index 3ffb1dbe7..65875f083 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
@@ -9,9 +9,9 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.DeptOption;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 
 import java.util.List;
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java
index 3298a794f..f34fff99a 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java
@@ -2,11 +2,11 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 
 import java.util.List;
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
index f7a58901a..74ce6fc6a 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
@@ -8,6 +8,8 @@ import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
 
 import java.util.List;
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 447638084..0d0702090 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -12,19 +12,11 @@ import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.*;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
-import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
-import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
-import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.PointLogFormDTO;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
@@ -35,18 +27,25 @@ import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
-import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
-import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
-import com.elink.esua.epdc.enums.AppUserRegisterWayEnum;
-import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.feign.*;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
 import com.elink.esua.epdc.jwt.JwtTokenUtils;
 import com.elink.esua.epdc.redis.AppUserRedis;
 import com.elink.esua.epdc.service.AppUserService;
+import com.elink.esua.epdc.user.dto.CachingUserInfoDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.UserGridInvitationCodeDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
+import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.enums.AppUserAuditStateEnum;
+import com.elink.esua.epdc.user.enums.AppUserRegisterSourceEnum;
+import com.elink.esua.epdc.user.enums.AppUserRegisterWayEnum;
+import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.utils.UserTagUtils;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -59,9 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.util.*;
 
 
@@ -602,6 +599,10 @@ public class AppUserServiceImpl implements AppUserService {
         Result<EpdcUserInfoResultDTO> infoById = userFeignClient.getInfoById(userDetail.getUserId());
         EpdcUserInfoResultDTO data = infoById.getData();
         data.setIsSignUp(isSignIn);
+        data.setStandardBearerFlag(
+                UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_STANDARD_BEARER)
+                        ? YesOrNoEnum.YES.value() : YesOrNoEnum.NO.value()
+        );
         return new Result<EpdcUserInfoResultDTO>().ok(data);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
index 64c762288..760d5766e 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
@@ -13,7 +13,6 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -21,6 +20,8 @@ import com.elink.esua.epdc.feign.CustomFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.redis.AppUserRedis;
 import com.elink.esua.epdc.service.CustomService;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java
index 8a91b534d..50163dd6a 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java
@@ -8,8 +8,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.enums.GroupStateEnum;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
@@ -19,6 +17,8 @@ import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.service.GroupService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.utils.UserTagUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
index 983fc5f46..c7c6c2341 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
@@ -9,15 +9,15 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.TemplateData;
-import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserWorkAndAnalyOpenIdDTO;
 import com.elink.esua.epdc.dto.form.SendMessageFormDTO;
-import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.MessageFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.MessageService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcDeleteWxFormIdFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
+import com.elink.esua.epdc.user.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.utils.HttpRequest;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
 import com.google.common.collect.Lists;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
index 3d6717962..65767a1e2 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
@@ -29,6 +29,8 @@ import com.elink.esua.epdc.service.MasterGroupService;
 import com.elink.esua.epdc.service.WorkIssueService;
 import com.elink.esua.epdc.service.WorkItemService;
 import com.elink.esua.epdc.service.WorkUserService;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java
index cdcd3d8b4..5345c1d49 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java
@@ -1,8 +1,7 @@
 package com.elink.esua.epdc.utils;
 
 import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
-import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
-import com.elink.esua.epdc.dto.UserTagInfo;
+import com.elink.esua.epdc.user.dto.UserTagInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
index 6bcac9654..1c85824c0 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
@@ -31,7 +31,6 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
 import com.elink.esua.epdc.modules.enterprise.dao.EnterpriseInfoDao;
 import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
@@ -39,6 +38,7 @@ import com.elink.esua.epdc.modules.enterprise.service.EnterpriseInfoService;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
index 44e4bdda7..afacf7ec2 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
@@ -35,7 +35,6 @@ import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.custom.dto.epidemic.PersonTestingDTO;
 import com.elink.esua.epdc.custom.dto.epidemic.PersonTestingPageDTO;
 import com.elink.esua.epdc.custom.dto.oss.UploadFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcPartyErroyResultDTO;
 import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao;
 import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
 import com.elink.esua.epdc.modules.epidemic.excel.PersonTestingImportMoudleExcel;
@@ -46,6 +45,7 @@ import com.elink.esua.epdc.modules.vaccine.epidemic.dao.EpidemicUserInfoDao;
 import com.elink.esua.epdc.modules.vaccine.epidemic.entity.EpidemicUserInfoEntity;
 import com.elink.esua.epdc.modules.vaccine.house.dao.PopulationInformationDao;
 import com.elink.esua.epdc.modules.vaccine.house.entity.PopulationInformationEntity;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcPartyErroyResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.BeanUtils;
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
index 2b0d9154c..c0bb2beed 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
@@ -2,8 +2,8 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
+import com.elink.esua.epdc.user.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
index b29ec6603..17d44af63 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
@@ -3,9 +3,9 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
+import com.elink.esua.epdc.user.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
index 1fba5c54c..34e9e86f1 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
@@ -32,7 +32,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.comment.*;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
 import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
@@ -58,6 +57,7 @@ import com.elink.esua.epdc.modules.issue.service.IssueService;
 import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
index f65137cae..53ebb62b3 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
@@ -10,8 +10,8 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
+import com.elink.esua.epdc.user.dto.UserDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
index a73572852..bccfda229 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
@@ -11,8 +11,8 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index a19c0a699..694f95cf8 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -87,6 +87,7 @@ import com.elink.esua.epdc.modules.item.service.*;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
index 382ee585a..146cbb5e0 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
@@ -31,7 +31,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.comment.*;
 import com.elink.esua.epdc.dto.constant.TopicNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
@@ -48,6 +47,7 @@ import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
 import com.elink.esua.epdc.modules.topic.service.TopicService;
 import com.elink.esua.epdc.modules.topic.service.impl.TopicServiceImpl;
+import com.elink.esua.epdc.user.dto.UserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java
index 648d6ea13..ab1e31ddd 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java
@@ -2,12 +2,12 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGridUserResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java
index 670fd0c38..a9405bf94 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java
@@ -3,12 +3,12 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGridUserResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java
index 26cd140f7..2adfc30f4 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java
@@ -3,12 +3,12 @@ package com.elink.esua.epdc.modules.group.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserReviewFormDTO;
 import com.elink.esua.epdc.modules.group.service.UserGroupService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java
index 99c455f6c..09c701b82 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java
@@ -20,8 +20,6 @@ package com.elink.esua.epdc.modules.group.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
 import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
@@ -29,6 +27,8 @@ import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserReviewFormDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.modules.group.entity.UserGroupEntity;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
index f4a87a6f4..ddc5e054d 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
@@ -32,11 +32,9 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.SysSmsTemplateConstant;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.constant.GroupConstant;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.dto.group.*;
@@ -58,6 +56,7 @@ import com.elink.esua.epdc.modules.group.service.UserGroupService;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.topic.service.GroupTopicUserReadService;
 import com.elink.esua.epdc.modules.topic.service.TopicService;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGridUserResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
index dbd28d5fc..2575960f1 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
@@ -26,13 +26,10 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.SysSmsTemplateConstant;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
 import com.elink.esua.epdc.dto.enums.GroupStateEnum;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.dto.group.GroupDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
@@ -46,6 +43,9 @@ import com.elink.esua.epdc.modules.group.dao.UserGroupDao;
 import com.elink.esua.epdc.modules.group.entity.UserGroupEntity;
 import com.elink.esua.epdc.modules.group.service.GroupService;
 import com.elink.esua.epdc.modules.group.service.UserGroupService;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 85f3057c6..8719f7a61 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -44,11 +44,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.constant.ActUserRelationStatusConstant;
 import com.elink.esua.epdc.constant.HeartNoticeConstant;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao;
 import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity;
@@ -59,6 +55,10 @@ import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index e706128f1..cd33e8252 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -40,10 +40,7 @@ import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.constant.ActUserPointsOperationTypeConstant;
 import com.elink.esua.epdc.constant.ActUserRelationStatusConstant;
 import com.elink.esua.epdc.constant.HeartNoticeConstant;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao;
@@ -57,6 +54,9 @@ import com.elink.esua.epdc.modules.activity.service.ActUserRelationService;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java
index 06a84d45c..eae84494b 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java
@@ -3,12 +3,8 @@ package com.elink.esua.epdc.modules.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ScheduleJobDTO;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.modules.feign.fallback.JobFeignClientFallback;
-import com.elink.esua.epdc.modules.feign.fallback.UserInfoFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java
index d68636c33..fd7258ea1 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java
@@ -2,11 +2,11 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserInfoFeignClientFallback;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java
index 2f7bb69e3..65ae6a05a 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java
@@ -4,7 +4,6 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ScheduleJobDTO;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.modules.feign.JobFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
 import org.springframework.stereotype.Component;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java
index 95f0d4b4b..5daf383f7 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java
@@ -3,11 +3,11 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java
index e7e699609..f12abb9f0 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java
@@ -18,8 +18,8 @@
 package com.elink.esua.epdc.modules.volunteer.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerRankService;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java
index 757a41d68..deafc9c6c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java
@@ -20,8 +20,8 @@ package com.elink.esua.epdc.modules.volunteer.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import com.elink.esua.epdc.volunteer.VolunteerRankDTO;
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java
index 5b8434bd8..24b539ad0 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java
@@ -24,11 +24,11 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerRankDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity;
 import com.elink.esua.epdc.modules.volunteer.redis.VolunteerRankRedis;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerRankService;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import com.elink.esua.epdc.volunteer.VolunteerRankDTO;
 import org.apache.commons.lang3.StringUtils;
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java
index 230d38575..2b5d7800b 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java
@@ -2,8 +2,8 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.feign.fallback.HeartFeignClientFallback;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index 975afbe24..62afc5e90 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -2,9 +2,9 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java
index 0bcf90b3f..3a5a5a4eb 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java
@@ -3,12 +3,13 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.feign.HeartFeignClient;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
+
 /**
  * @Author：wanggongfeng
  * @Date：2019/12/16 15:11
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
index d3ab4b71f..dbe8bd652 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
@@ -3,9 +3,9 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerServiceImpl.java
index dfb6eabfa..dffe66310 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerServiceImpl.java
@@ -9,10 +9,10 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.feign.HeartFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.VolunteerService;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
index 6a5eb3731..f3a507d29 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
@@ -2,9 +2,9 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
index 2494bf24b..2b80184a1 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
@@ -3,9 +3,9 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java
index a119de4f0..5f0d5580b 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java
@@ -25,10 +25,10 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.logs.excel.PointsLogsExcel;
 import com.elink.esua.epdc.modules.logs.service.PointsLogsService;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -105,7 +105,7 @@ public class PointsLogsController {
      * @Date 2019/12/16 18:56
      **/
     @PostMapping("confirmAdjustPoint")
-    public Result confirmAdjustPoint(@RequestBody  EpdcAdjustVolunteerPointsDTO formDto){
+    public Result confirmAdjustPoint(@RequestBody EpdcAdjustVolunteerPointsDTO formDto){
         ValidatorUtils.validateEntity(formDto);
         return pointsLogsService.confirmAdjustPoint(formDto);
     }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java
index 6d43ada76..d2a4e4dd2 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java
@@ -20,9 +20,9 @@ package com.elink.esua.epdc.modules.logs.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.logs.entity.PointsLogsEntity;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
index fce148a4b..5618642af 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
@@ -30,10 +30,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.PointsNoticeConstant;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
@@ -41,6 +38,9 @@ import com.elink.esua.epdc.modules.logs.dao.PointsLogsDao;
 import com.elink.esua.epdc.modules.logs.entity.PointsLogsEntity;
 import com.elink.esua.epdc.modules.logs.redis.PointsLogsRedis;
 import com.elink.esua.epdc.modules.logs.service.PointsLogsService;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/aop/PointsBehaviorAop.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/aop/PointsBehaviorAop.java
index 0ecdad1c2..6e2b1c728 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/aop/PointsBehaviorAop.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/aop/PointsBehaviorAop.java
@@ -4,7 +4,6 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.dto.logs.UserPointsLogDTO;
 import com.elink.esua.epdc.dto.rule.PointsRuleDTO;
@@ -12,6 +11,7 @@ import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.logs.service.PointsLogsService;
 import com.elink.esua.epdc.modules.rule.service.PointsRuleService;
 import com.elink.esua.epdc.support.annotion.PointsBehavior;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPageResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPageResultDTO.java
deleted file mode 100644
index da67eb252..000000000
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPageResultDTO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.elink.esua.epdc.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class UserPageResultDTO implements Serializable {
-
-    private static final long serialVersionUID = 5045626981759008058L;
-
-
-    /**
-     * 电话
-     */
-    private String mobile;
-
-    /**
-     * 性别：女性-0，男性-1
-     */
-    private String sex;
-
-    /**
-     * 手机号
-     */
-    private String telePhone;
-
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     * 身份证
-     */
-    private String identityNo;
-
-    /**
-     * 小区名称
-     */
-    private String villageName;
-}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPendingTrialResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPendingTrialResultDTO.java
deleted file mode 100644
index 7f02ac613..000000000
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPendingTrialResultDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.elink.esua.epdc.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class UserPendingTrialResultDTO implements Serializable {
-
-    private static final long serialVersionUID = -3873561798809799809L;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     *身份证号
-     */
-    private String identityNo;
-
-    /**
-     *小区名称
-     */
-    private String villageName;
-
-    /**
-     * 居民住址
-     */
-    private String address;
-
-
-}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/AuthenticatedConsant.java
similarity index 86%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/AuthenticatedConsant.java
index 1fd594cc7..d3ace4a6d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/AuthenticatedConsant.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.constant;
+package com.elink.esua.epdc.user.constant;
 
 /**
  * @author: qushutong
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/UserFieldConsant.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/UserFieldConsant.java
index 7df9b1393..09445f113 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/UserFieldConsant.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.constant;
+package com.elink.esua.epdc.user.constant;
 
 /**
  * 用户模块字段常量
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/VolunteerInfoNoticeConstant.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/VolunteerInfoNoticeConstant.java
index 2c8c0b9b0..95737733c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/constant/VolunteerInfoNoticeConstant.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.constant;
+package com.elink.esua.epdc.user.constant;
 
 /**
  * @Description 志愿者审批发送消息常量
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java
index 81103fe09..96ba7370c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyAuthenticationFailedDTO.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyAuthenticationFailedDTO.java
index 0c06ad5d4..186089d92 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyAuthenticationFailedDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyMemberModifyFormDTO.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyMemberModifyFormDTO.java
index 1feaf4d4c..78498ee74 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyMemberModifyFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyMembersDTO.java
old mode 100755
new mode 100644
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyMembersDTO.java
index eb6eaac27..e2a672e05
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyMembersDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyStandardBearerApplyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyStandardBearerApplyDTO.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyStandardBearerApplyDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyStandardBearerApplyDTO.java
index 5379efb9e..72ad274ab 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyStandardBearerApplyDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyStandardBearerApplyDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyTagRelationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyTagRelationDTO.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyTagRelationDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyTagRelationDTO.java
index a8f243fa6..3e07dbc04
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyTagRelationDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PartyTagRelationDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 
 import java.io.Serializable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PointLogFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PointLogFormDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PointLogFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PointLogFormDTO.java
index bef5f69fd..422f726a3 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PointLogFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/PointLogFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserActivePointsResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserActivePointsResultDTO.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserActivePointsResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserActivePointsResultDTO.java
index 96b6de664..4a583f0fa 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserActivePointsResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserActivePointsResultDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserAuthenticateHistoryDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserAuthenticateHistoryDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserAuthenticateHistoryDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserAuthenticateHistoryDTO.java
index fc6a2eb9f..dc371168d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserAuthenticateHistoryDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserAuthenticateHistoryDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java
index f69f216a2..66f91f9d3 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java
@@ -15,12 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 
 import java.io.Serializable;
 import java.util.Date;
 
+import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
 import lombok.Data;
 
 
@@ -212,7 +213,7 @@ public class UserDTO implements Serializable {
     private String inviteUserId;
 
     /**
-     * 状态，参考枚举类：{@link com.elink.esua.epdc.enums.AppUserStatesEnum}
+     * 状态，参考枚举类：{@link AppUserStatesEnum}
      */
     private String state;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridInvitationCodeDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserGridInvitationCodeDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridInvitationCodeDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserGridInvitationCodeDTO.java
index 0b7925367..4e4365913 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridInvitationCodeDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserGridInvitationCodeDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserGridRelationDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserGridRelationDTO.java
index 68f365019..95a19a05a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserGridRelationDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserInvitationRecordDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserInvitationRecordDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserInvitationRecordDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserInvitationRecordDTO.java
index 417b83c30..222c7982c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserInvitationRecordDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserInvitationRecordDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagDTO.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagDTO.java
index 2e40c8703..125cc51fc
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 
 import java.io.Serializable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagInfo.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagInfo.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagInfo.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagInfo.java
index 35aa8adc3..b9c606353 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagInfo.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagInfo.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagRelationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagRelationDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagRelationDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagRelationDTO.java
index a09432ea4..3d923c85d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagRelationDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserTagRelationDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserWxFormIdDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserWxFormIdDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserWxFormIdDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserWxFormIdDTO.java
index f4827fcd5..a46587d29 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserWxFormIdDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserWxFormIdDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/VolunteerInfoDTO.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/VolunteerInfoDTO.java
index b66da6c4a..8383d190b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/VolunteerInfoDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/EpdcCompleteAppUserDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/EpdcCompleteAppUserDTO.java
index 30afff993..e25f04000 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/EpdcCompleteAppUserDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc;
+package com.elink.esua.epdc.user.dto.epdc;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcGridLeaderRegisterDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/EpdcGridLeaderRegisterDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcGridLeaderRegisterDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/EpdcGridLeaderRegisterDTO.java
index 842d73995..abc744e70 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcGridLeaderRegisterDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/EpdcGridLeaderRegisterDTO.java
@@ -1,5 +1,6 @@
-package com.elink.esua.epdc.dto.epdc;
+package com.elink.esua.epdc.user.dto.epdc;
 
+import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -102,7 +103,7 @@ public class EpdcGridLeaderRegisterDTO implements Serializable {
     private String mobileCarrier;
 
     /**
-     * 状态，参考枚举类：{@link com.elink.esua.epdc.enums.AppUserStatesEnum}
+     * 状态，参考枚举类：{@link AppUserStatesEnum}
      */
     private String state;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/UserCarInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/UserCarInfoDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/UserCarInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/UserCarInfoDTO.java
index 43cad7dbc..332ce9c7d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/UserCarInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/UserCarInfoDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.epdc;
+package com.elink.esua.epdc.user.dto.epdc;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
index fb37fa0df..6efb83189 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/CompleteRequisiteUserInfoDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java
index 286510ac1..3662c9351 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java
index 43b83575d..611af43f9 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java
index 47acb88df..b9b488c13 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
index 15d1f9399..e3b5590e8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java
similarity index 70%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java
index b48d7e95c..a6e17dbd2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java
@@ -1,7 +1,7 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java
index 34e1b3f04..add6c4f55 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java
index 87c8f9269..2ba1369a6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
index ae136f24c..64a730d39 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java
index 3f19c69eb..ae7dd8c0c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java
similarity index 72%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java
index e90f0e9d1..a178e9235 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java
@@ -1,7 +1,7 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java
index 5dee1d708..9a4046973 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java
index 417c30d0a..fd1c88a42 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcResidentDetailFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcResidentDetailFormDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcResidentDetailFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcResidentDetailFormDTO.java
index 963de95f7..cb2763c5a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcResidentDetailFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcResidentDetailFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
index 071a6ef77..122f4a100 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java
index 965ec8b3d..969ed9687 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGroupInviteFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserGroupInviteFormDTO.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGroupInviteFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserGroupInviteFormDTO.java
index 4ed8b22d3..8a8b6fd05 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGroupInviteFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserGroupInviteFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserMatchTagFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserMatchTagFormDTO.java
new file mode 100644
index 000000000..cf8e7756d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserMatchTagFormDTO.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.user.dto.epdc.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+/***
+ * 用户ID匹配标签
+ * @author work@yujt.net.cn
+ * @date 2022/4/28/0028 16:03
+ */
+@Data
+public class EpdcUserMatchTagFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1987835791588170717L;
+
+    /**
+     * 标签 #{@link com.elink.esua.epdc.commons.tools.enums.UserTagEnum}
+     */
+    @NotBlank(message = "标签值不能为空")
+    private String userTagValue;
+
+    /**
+     * 用户ID集合
+     */
+    private List<String> userIdList;
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserPointsFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserPointsFormDTO.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserPointsFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserPointsFormDTO.java
index fbee72101..300565fdc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserPointsFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserPointsFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java
index 972804249..7aa76815a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java
similarity index 80%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java
index 8e3458e8b..d5098876d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegisterBindGridFormDTO.java
@@ -1,7 +1,7 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserSaveWxFormIdFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserSaveWxFormIdFormDTO.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserSaveWxFormIdFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserSaveWxFormIdFormDTO.java
index ab9134741..2f21400bc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserSaveWxFormIdFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserSaveWxFormIdFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserUpdateAvatarFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserUpdateAvatarFromDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserUpdateAvatarFromDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserUpdateAvatarFromDTO.java
index 2c0e3ab8e..89ee2d103 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserUpdateAvatarFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserUpdateAvatarFromDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserUpdateMobileFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserUpdateMobileFromDTO.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserUpdateMobileFromDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserUpdateMobileFromDTO.java
index 6682139ed..43ea5e195 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserUpdateMobileFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserUpdateMobileFromDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java
index cc9be3fb3..904fb62ae 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcWorkUserFromDTO.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcWorkUserFromDTO.java
index ce5b9335d..4bbd950cb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcWorkUserFromDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/InvitedQRCodeFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/InvitedQRCodeFormDTO.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/InvitedQRCodeFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/InvitedQRCodeFormDTO.java
index 174d7224b..8d93f69c8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/InvitedQRCodeFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/InvitedQRCodeFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserLoginLogDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/UserLoginLogDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserLoginLogDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/UserLoginLogDTO.java
index 304a90821..63d73a5a7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserLoginLogDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/UserLoginLogDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserPointsFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/UserPointsFormDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserPointsFormDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/UserPointsFormDTO.java
index a0adf9769..bb50fa8a4 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserPointsFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/UserPointsFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.form;
+package com.elink.esua.epdc.user.dto.epdc.form;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
index 4e75175ca..bbab346e7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java
index 7a4fa6670..c5441826c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcGetVolunteerRankDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcGetVolunteerRankDTO.java
index 22195aae4..e513f409c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcGetVolunteerRankDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGridUserResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcGridUserResultDTO.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGridUserResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcGridUserResultDTO.java
index ab886e17b..be4cab6f0 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGridUserResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcGridUserResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyErroyResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcPartyErroyResultDTO.java
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyErroyResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcPartyErroyResultDTO.java
index 5957f88ab..73d6059cd 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyErroyResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcPartyErroyResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcPartyMemberDetailDto.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcPartyMemberDetailDto.java
index 510e5c994..64762926e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcPartyMemberDetailDto.java
@@ -1,10 +1,9 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO;
 
 @Data
 public class EpdcPartyMemberDetailDto implements Serializable {
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcResidentDetailGridResultDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcResidentDetailGridResultDTO.java
index 7bad702bb..b7ecb454c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcResidentDetailGridResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcResidentDetailResultDTO.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcResidentDetailResultDTO.java
index 43921ea2c..5335bb8f3 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcResidentDetailResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java
index 78cf90d45..84c5060ea 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGridResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserGridResultDTO.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGridResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserGridResultDTO.java
index 46d8497de..3d9612f25 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGridResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserGridResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGroupInviteResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserGroupInviteResultDTO.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGroupInviteResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserGroupInviteResultDTO.java
index 382049724..c43a42647 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserGroupInviteResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserGroupInviteResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
similarity index 84%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
index 9f00ac3db..884b5d908 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
@@ -20,6 +20,10 @@ public class EpdcUserInfoResultDTO implements Serializable {
     private String dwellingPlace;
     private String faceImg;
     private String partyFlag;
+    /**
+     * 党员是否亮党旗
+     */
+    private String standardBearerFlag;
 
     private String isSignUp;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java
index 45ec1f693..fabf7fa61 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserRegisterAuditMsgResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserRegisterInfoResultDTO.java
similarity index 86%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterInfoResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserRegisterInfoResultDTO.java
index 2930b0ecc..fb89ceef8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserRegisterInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserRegisterInfoResultDTO.java
@@ -1,6 +1,6 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
-import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcVolunteerInfoResultDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcVolunteerInfoResultDTO.java
index 69c3841c6..9b9fd71c0 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcVolunteerInfoResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcWorkUserResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcWorkUserResultDTO.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcWorkUserResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcWorkUserResultDTO.java
index 4a429bbc4..e2499f10f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcWorkUserResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcWorkUserResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/StandardBearerStatusResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/StandardBearerStatusResultDTO.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/StandardBearerStatusResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/StandardBearerStatusResultDTO.java
index 9dce09b32..956d33dd8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/StandardBearerStatusResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/StandardBearerStatusResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserInvitationRecordResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/UserInvitationRecordResultDTO.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserInvitationRecordResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/UserInvitationRecordResultDTO.java
index 40a18208b..dc193bf76 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserInvitationRecordResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/UserInvitationRecordResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.epdc.result;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPartyStandardAppltResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/UserPartyStandardAppltResultDTO.java
similarity index 88%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPartyStandardAppltResultDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/UserPartyStandardAppltResultDTO.java
index 5f1205d78..9da154cfa 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPartyStandardAppltResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/UserPartyStandardAppltResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.user.dto.epdc.result;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserBaseInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserBaseInfoDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserBaseInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserBaseInfoDTO.java
index 8d6f6f08f..fb89e77cf 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserBaseInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserBaseInfoDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.product.result;
+package com.elink.esua.epdc.user.dto.product.result;
 
 
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserResiInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserResiInfoDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserResiInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserResiInfoDTO.java
index f9babeb2b..c4dfb145e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserResiInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserResiInfoDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.product.result;
+package com.elink.esua.epdc.user.dto.product.result;
 
 
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserRoleDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserRoleDTO.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserRoleDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserRoleDTO.java
index 6bc5c8b7d..bbcfe3460 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetUserRoleDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetUserRoleDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.product.result;
+package com.elink.esua.epdc.user.dto.product.result;
 
 
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetVolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetVolunteerInfoDTO.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetVolunteerInfoDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetVolunteerInfoDTO.java
index 9bff6451f..d541043cb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/product/result/EpmetVolunteerInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/product/result/EpmetVolunteerInfoDTO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto.product.result;
+package com.elink.esua.epdc.user.dto.product.result;
 
 
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserAuditStateEnum.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserAuditStateEnum.java
index ac2ae1e6c..392aea925 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserAuditStateEnum.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.enums;
+package com.elink.esua.epdc.user.enums;
 
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserRegisterSourceEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserRegisterSourceEnum.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserRegisterSourceEnum.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserRegisterSourceEnum.java
index 647c2f962..b0f5432d7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserRegisterSourceEnum.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserRegisterSourceEnum.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.enums;
+package com.elink.esua.epdc.user.enums;
 
 /**
  * 用户来源枚举
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserRegisterWayEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserRegisterWayEnum.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserRegisterWayEnum.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserRegisterWayEnum.java
index e836ec880..c32a0d094 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserRegisterWayEnum.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserRegisterWayEnum.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.enums;
+package com.elink.esua.epdc.user.enums;
 
 /**
  * 用户注册方式枚举
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStatesEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserStatesEnum.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStatesEnum.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserStatesEnum.java
index e5f251a82..a5d5067a1 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStatesEnum.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/AppUserStatesEnum.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.enums;
+package com.elink.esua.epdc.user.enums;
 
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/PartyMemberRegFlagEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/PartyMemberRegFlagEnum.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/PartyMemberRegFlagEnum.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/PartyMemberRegFlagEnum.java
index bb8603d08..7f62b118f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/PartyMemberRegFlagEnum.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/enums/PartyMemberRegFlagEnum.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.enums;
+package com.elink.esua.epdc.user.enums;
 
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/async/NewsTask.java
similarity index 88%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/async/NewsTask.java
index 256bb52f9..0cd158528 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/async/NewsTask.java
@@ -1,7 +1,7 @@
-package com.elink.esua.epdc.async;
+package com.elink.esua.epdc.user.async;
 
+import com.elink.esua.epdc.user.feign.NewsFeignClient;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.feign.NewsFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/async/PartyTask.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/async/PartyTask.java
index f72cde0fc..ce2695950 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/async/PartyTask.java
@@ -1,6 +1,6 @@
-package com.elink.esua.epdc.async;
+package com.elink.esua.epdc.user.async;
 
-import com.elink.esua.epdc.service.PartyMembersService;
+import com.elink.esua.epdc.user.service.PartyMembersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/config/ModuleConfigImpl.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/config/ModuleConfigImpl.java
index f4d2ecc9d..762c9b5b6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/config/ModuleConfigImpl.java
@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.elink.esua.epdc.config;
+package com.elink.esua.epdc.user.config;
 
 import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
similarity index 83%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
index fcc8dd580..4a582f669 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
@@ -1,16 +1,17 @@
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CachingUserInfoDTO;
-import com.elink.esua.epdc.dto.StandardBearerStatusResultDTO;
-import com.elink.esua.epdc.dto.UserActivePointsResultDTO;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.service.UserInvitationRecordService;
-import com.elink.esua.epdc.service.UserService;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
+import com.elink.esua.epdc.user.dto.CachingUserInfoDTO;
+import com.elink.esua.epdc.user.dto.UserActivePointsResultDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.service.UserInvitationRecordService;
+import com.elink.esua.epdc.user.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,7 +37,7 @@ public class EpdcAppUserController {
      * 根据用户openId获取用户信息(只查询已注册或审核中的用户)
      *
      * @param openId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:03
      */
@@ -49,7 +50,7 @@ public class EpdcAppUserController {
      * 查询用户基础信息
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/26 15:13
      */
@@ -63,7 +64,7 @@ public class EpdcAppUserController {
      * 登录前，获取用户信息
      *
      * @param openId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/24 13:57
      */
@@ -76,7 +77,7 @@ public class EpdcAppUserController {
      * 根据用户unionId获取用户信息(只查询已注册或审核中的用户)
      *
      * @param unionId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:03
      */
@@ -87,7 +88,7 @@ public class EpdcAppUserController {
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @Author yinzuomei
      * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
      * @Date 2019/12/7 13:57
@@ -114,7 +115,7 @@ public class EpdcAppUserController {
      * 网格长注册
      *
      * @param registerDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/23 09:34
      */
@@ -128,7 +129,7 @@ public class EpdcAppUserController {
      * @Author qushutong
      * @Date 2019/9/9 17:00
      * @Param [id]
-     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO>
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserInfoResultDTO>
      * @Exception
      *
      */
@@ -170,7 +171,7 @@ public class EpdcAppUserController {
      * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterAuditMsgResultDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/27 09:13
      */
@@ -182,7 +183,7 @@ public class EpdcAppUserController {
     /**
      * 社群添加好友列表
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:22
@@ -209,7 +210,7 @@ public class EpdcAppUserController {
     /**
      * 用户注册或绑定网格
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterInfoResultDTO>
      * @params [fromDto]
      * @author liuchuang
      * @since 2019/10/25 14:30
@@ -336,7 +337,7 @@ public class EpdcAppUserController {
     /**
      * 获取邀请记录
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:22
@@ -350,7 +351,7 @@ public class EpdcAppUserController {
     /**
      * 获取用户最后一次切换的网格信息
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterInfoResultDTO>
      * @params [openId]
      * @author liuchuang
      * @since 2019/12/6 11:01
@@ -362,7 +363,7 @@ public class EpdcAppUserController {
 
     /**
      * @param gridIdList
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcGridUserResultDTO>>
      * @Author yinzuomei
      * @Description 根据网格id查询网格下所有的用户
      * @Date 2019/12/19 15:02
@@ -375,7 +376,7 @@ public class EpdcAppUserController {
     /***
      * 居民在防疫哨卡进行登记时，上送数据并完善党群系统个人信息
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcGridUserResultDTO>>
      * @author qushutong
      * @date 2020/2/15 11:06
      */
@@ -401,7 +402,7 @@ public class EpdcAppUserController {
      * 获取用户缓存信息
      *
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<CachingUserInfoDTO>
      * @author rongchao
      * @since 2019-12-18
      */
@@ -414,7 +415,7 @@ public class EpdcAppUserController {
      * 根据用户ID获取用户缓存信息
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterInfoResultDTO>
      * @author rongchao
      * @since 2019-12-19
      */
@@ -426,7 +427,11 @@ public class EpdcAppUserController {
     /***
      * 更新用户接口
      * @param formDTO
+    <<<<<<< Updated upstream:esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+    =======
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<CachingUserInfoDTO>
+    >>>>>>> Stashed changes:esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java
      * @author qushutong
      * @date 2021/9/27 17:41
      */
@@ -446,7 +451,7 @@ public class EpdcAppUserController {
      * 是否申请过亮党旗
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO>
      * @author LZN
      * @date 2022/4/28 14:22
      */
@@ -469,4 +474,18 @@ public class EpdcAppUserController {
         return userService.StandarBearerApply(userId, gridId);
     }
 
+    /**
+     * 通过标签过滤用户ID
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
+     * @author work@yujt.net.cn
+     * @date 2022/4/28/0028 17:00
+     */
+    @PostMapping("filteridlist/bytag")
+    public Result<List<String>> filterUserIdListByTag(@RequestBody EpdcUserMatchTagFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        List<String> userIdList = userService.filterUserIdListByTag(formDto);
+        return new Result().ok(userIdList);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserWxFormIdController.java
similarity index 88%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserWxFormIdController.java
index 9bf96d6db..56c7fa259 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserWxFormIdController.java
@@ -15,17 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.UserWxFormIdDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserSaveWxFormIdFormDTO;
-import com.elink.esua.epdc.service.UserWxFormIdService;
+import com.elink.esua.epdc.user.dto.UserWxFormIdDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcDeleteWxFormIdFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserSaveWxFormIdFormDTO;
+import com.elink.esua.epdc.user.service.UserWxFormIdService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -80,7 +80,7 @@ public class EpdcAppUserWxFormIdController {
     /***
      * 查出最新一条记录
      * @param openId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserWxFormIdDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserWxFormIdDTO>
      * @author qushutong
      * @date 2019/9/26 14:11
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppVolunteerInfoController.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppVolunteerInfoController.java
index 99306f05f..426d0e7f4 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppVolunteerInfoController.java
@@ -1,13 +1,13 @@
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
-import com.elink.esua.epdc.service.VolunteerInfoService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.user.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcUserGridRelationController.java
similarity index 82%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcUserGridRelationController.java
index 98bc55075..296bc167b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcUserGridRelationController.java
@@ -15,15 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.service.UserGridRelationService;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppRemoveGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
+import com.elink.esua.epdc.user.service.UserGridRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,7 +47,7 @@ public class EpdcUserGridRelationController {
      * 网格长小程序端切换网格
      *
      * @param switchGridDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserGridRelationDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/23 11:04
      */
@@ -60,7 +60,7 @@ public class EpdcUserGridRelationController {
      * 获取网格长管理的网格列表
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcUserGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:26
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java
index 2453cdab7..e628c9826 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java
@@ -15,10 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -27,9 +26,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
-import com.elink.esua.epdc.excel.PartyAuthenticationFailedExcel;
-import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
+import com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO;
+import com.elink.esua.epdc.user.excel.PartyAuthenticationFailedExcel;
+import com.elink.esua.epdc.user.service.PartyAuthenticationFailedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java
old mode 100755
new mode 100644
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java
index 99bcee5da..1c1bec300
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -27,9 +27,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.PartyMembersDTO;
-import com.elink.esua.epdc.excel.PartyMembersExcel;
-import com.elink.esua.epdc.service.PartyMembersService;
+import com.elink.esua.epdc.user.dto.PartyMembersDTO;
+import com.elink.esua.epdc.user.excel.PartyMembersExcel;
+import com.elink.esua.epdc.user.service.PartyMembersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -56,7 +56,7 @@ public class PartyMembersController {
      * 党员库
      *
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < PartyMembersDTO>>
      * @author
      * @date 2020/2/24 15:16
      */
@@ -69,7 +69,7 @@ public class PartyMembersController {
      * 已认证党员列表
      *
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < PartyMembersDTO>>
      * @author
      * @date 2020/2/21 19:06
      */
@@ -153,7 +153,7 @@ public class PartyMembersController {
     /***
      * 已认证党员导出
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < PartyMembersDTO>>
      * @author qushutong
      * @date 2019/12/29 14:43
      */
@@ -166,7 +166,7 @@ public class PartyMembersController {
     /***
      * 已认证党员优化
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < PartyMembersDTO>>
      * @author qushutong
      * @date 2020/3/19 13:34
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyStandardBearerApplyController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyStandardBearerApplyController.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyStandardBearerApplyController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyStandardBearerApplyController.java
index c9342f3e0..b961b572a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyStandardBearerApplyController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyStandardBearerApplyController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.PartyStandardBearerApplyDTO;
-import com.elink.esua.epdc.excel.PartyStandardBearerApplyExcel;
-import com.elink.esua.epdc.service.PartyStandardBearerApplyService;
+import com.elink.esua.epdc.user.dto.PartyStandardBearerApplyDTO;
+import com.elink.esua.epdc.user.excel.PartyStandardBearerApplyExcel;
+import com.elink.esua.epdc.user.service.PartyStandardBearerApplyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyTagRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyTagRelationController.java
old mode 100755
new mode 100644
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyTagRelationController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyTagRelationController.java
index afb401335..9b00f1b23
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyTagRelationController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyTagRelationController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.PartyTagRelationDTO;
-import com.elink.esua.epdc.excel.PartyTagRelationExcel;
-import com.elink.esua.epdc.service.PartyTagRelationService;
+import com.elink.esua.epdc.user.dto.PartyTagRelationDTO;
+import com.elink.esua.epdc.user.excel.PartyTagRelationExcel;
+import com.elink.esua.epdc.user.service.PartyTagRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserAuthenticateHistoryController.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserAuthenticateHistoryController.java
index 94db73b55..10cf0df75 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserAuthenticateHistoryController.java
@@ -15,9 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
-import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -26,12 +25,12 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
-import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
-import com.elink.esua.epdc.excel.UserAuthenticateHistoryExcel;
-import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
+import com.elink.esua.epdc.user.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
+import com.elink.esua.epdc.user.entity.UserAuthenticateHistoryEntity;
+import com.elink.esua.epdc.user.excel.UserAuthenticateHistoryExcel;
+import com.elink.esua.epdc.user.service.UserAuthenticateHistoryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -68,7 +67,7 @@ public class UserAuthenticateHistoryController {
 
     /**
      * @param userId 用户id
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < UserAuthenticateHistoryDTO>>
      * @Author yinzuomei
      * @Description 根据用户id查询认证历史记录
      * @Date 2019/11/21 13:59
@@ -114,7 +113,7 @@ public class UserAuthenticateHistoryController {
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcAuthenticateHistoryResultDTO>>
      * @Author yinzuomei
      * @Description 用户认证审核历史
      * @Date 2019/11/22 13:17
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserCarInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserCarInfoController.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserCarInfoController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserCarInfoController.java
index 34358f25c..e22435819 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserCarInfoController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserCarInfoController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
-import com.elink.esua.epdc.excel.UserCarInfoExcel;
-import com.elink.esua.epdc.service.UserCarInfoService;
+import com.elink.esua.epdc.user.dto.epdc.UserCarInfoDTO;
+import com.elink.esua.epdc.user.excel.UserCarInfoExcel;
+import com.elink.esua.epdc.user.service.UserCarInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
index 41d07eec1..b1e6ca924 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -26,12 +26,12 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.PartyMemberModifyFormDTO;
-import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
-import com.elink.esua.epdc.enums.AppUserStatesEnum;
-import com.elink.esua.epdc.excel.UserExcel;
-import com.elink.esua.epdc.service.UserService;
+import com.elink.esua.epdc.user.dto.PartyMemberModifyFormDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
+import com.elink.esua.epdc.user.excel.UserExcel;
+import com.elink.esua.epdc.user.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,7 +67,7 @@ public class UserController {
      * 待认证党员列表
      *
      * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<UserDTO>>
      * @author liuchuang
      * @since 2020/3/24 15:47
      */
@@ -259,7 +259,7 @@ public class UserController {
     /***
      * 展示所有的
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < UserDTO>>
      * @author qushutong
      * @date 2020/3/16 10:51
      */
@@ -273,7 +273,7 @@ public class UserController {
     /***
      * 已认证居民
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < UserDTO>>
      * @author qushutong
      * @date 2020/3/16 16:54
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridInvitationCodeController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserGridInvitationCodeController.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridInvitationCodeController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserGridInvitationCodeController.java
index c1b9035b0..04c46a3db 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridInvitationCodeController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserGridInvitationCodeController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,10 +25,10 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
-import com.elink.esua.epdc.excel.UserGridInvitationCodeExcel;
-import com.elink.esua.epdc.service.UserGridInvitationCodeService;
+import com.elink.esua.epdc.user.dto.UserGridInvitationCodeDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
+import com.elink.esua.epdc.user.excel.UserGridInvitationCodeExcel;
+import com.elink.esua.epdc.user.service.UserGridInvitationCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -93,7 +93,7 @@ public class UserGridInvitationCodeController {
     }
 
     /**
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridInvitationCodeDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserGridInvitationCodeDTO>
      * @param formDTO
      * @Author yinzuomei
      * @Description 查询用户邀请码生成记录
@@ -121,7 +121,7 @@ public class UserGridInvitationCodeController {
     }
 
     /**
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridInvitationCodeDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserGridInvitationCodeDTO>
      * @param id
      * @Author yinzuomei
      * @Description 根据用户网格邀请码表主键查询记录
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserGridRelationController.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserGridRelationController.java
index a4ca83a59..c686eaa99 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserGridRelationController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -24,8 +24,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.service.UserGridRelationService;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.service.UserGridRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserInvitationRecordController.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserInvitationRecordController.java
index abdb904d7..f11eea457 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserInvitationRecordController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.UserInvitationRecordDTO;
-import com.elink.esua.epdc.excel.UserInvitationRecordExcel;
-import com.elink.esua.epdc.service.UserInvitationRecordService;
+import com.elink.esua.epdc.user.dto.UserInvitationRecordDTO;
+import com.elink.esua.epdc.user.excel.UserInvitationRecordExcel;
+import com.elink.esua.epdc.user.service.UserInvitationRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserLoginLogController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserLoginLogController.java
similarity index 83%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserLoginLogController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserLoginLogController.java
index 50cd16e35..c4636f358 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserLoginLogController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserLoginLogController.java
@@ -1,14 +1,14 @@
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.UserLoginLogDTO;
 
-import com.elink.esua.epdc.service.UserLoginLogService;
+import com.elink.esua.epdc.user.service.UserLoginLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserTagController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserTagController.java
old mode 100755
new mode 100644
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserTagController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserTagController.java
index 2157e3886..40fea4f62
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserTagController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserTagController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.excel.UserTagExcel;
-import com.elink.esua.epdc.service.UserTagService;
+import com.elink.esua.epdc.user.dto.UserTagDTO;
+import com.elink.esua.epdc.user.excel.UserTagExcel;
+import com.elink.esua.epdc.user.service.UserTagService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserTagRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserTagRelationController.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserTagRelationController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserTagRelationController.java
index 3f58de6e2..b0ccf595b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserTagRelationController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserTagRelationController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.UserTagRelationDTO;
-import com.elink.esua.epdc.excel.UserTagRelationExcel;
-import com.elink.esua.epdc.service.UserTagRelationService;
+import com.elink.esua.epdc.user.dto.UserTagRelationDTO;
+import com.elink.esua.epdc.user.excel.UserTagRelationExcel;
+import com.elink.esua.epdc.user.service.UserTagRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserWxFormIdController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserWxFormIdController.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserWxFormIdController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserWxFormIdController.java
index c32147de7..ffc6d4633 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserWxFormIdController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserWxFormIdController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.UserWxFormIdDTO;
-import com.elink.esua.epdc.excel.UserWxFormIdExcel;
-import com.elink.esua.epdc.service.UserWxFormIdService;
+import com.elink.esua.epdc.user.dto.UserWxFormIdDTO;
+import com.elink.esua.epdc.user.excel.UserWxFormIdExcel;
+import com.elink.esua.epdc.user.service.UserWxFormIdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java
similarity index 88%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java
index 208eab223..459f4feb6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.controller;
+package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@@ -25,12 +25,12 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
-import com.elink.esua.epdc.excel.VolunteerInfoExcel;
-import com.elink.esua.epdc.service.UserTagService;
-import com.elink.esua.epdc.service.VolunteerInfoService;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.user.excel.VolunteerInfoExcel;
+import com.elink.esua.epdc.user.service.UserTagService;
+import com.elink.esua.epdc.user.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,7 +58,7 @@ public class VolunteerInfoController {
     /**
      * @Description: 查询志愿者列表数据
      * @Param: [params]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < VolunteerInfoDTO>>
      * @Author: zy
      * @Date: 2019-12-17
      */
@@ -72,7 +72,7 @@ public class VolunteerInfoController {
      * @Description: 根据志愿者ID，查询志愿者 信息详情
      * 积分需要连user表查询
      * @Param: [id]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.VolunteerInfoDTO>
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<VolunteerInfoDTO>
      * @Author: zy
      * @Date: 2019-12-17
      */
@@ -133,7 +133,7 @@ public class VolunteerInfoController {
 
     /**
      * @param id
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcAdjustVolunteerPointsDTO>
      * @Author yinzuomei
      * @Description 积分调整按钮按下, 查询用户信息
      * @Date 2019/12/16 17:48
@@ -157,7 +157,7 @@ public class VolunteerInfoController {
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.VolunteerInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<VolunteerInfoDTO>
      * @Author yinzuomei
      * @Description 根据用户id查询志愿者信息
      * @Date 2020/2/6 12:23
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyAuthenticationFailedDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyAuthenticationFailedDao.java
similarity index 85%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyAuthenticationFailedDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyAuthenticationFailedDao.java
index aa3690901..20f93fc22 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyAuthenticationFailedDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyAuthenticationFailedDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.PartyAuthenticationFailedEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
-import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
+import com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -37,7 +37,7 @@ public interface PartyAuthenticationFailedDao extends BaseDao<PartyAuthenticatio
     /**
      * 查询认证失败的党员列表
      * @params params
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author gp
      * @date 2019-11-18
      */
@@ -48,7 +48,7 @@ public interface PartyAuthenticationFailedDao extends BaseDao<PartyAuthenticatio
      * 查询需要修改的组织机构信息
      *
      * @params [deptId]
-     * @return java.util.List<com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO>
+     * @return java.util.List<PartyAuthenticationFailedDTO>
      * @author liuchuang
      * @since 2020/3/7 15:31
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyMembersDao.java
old mode 100755
new mode 100644
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyMembersDao.java
index 7a78463b0..fb365b652
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyMembersDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.PartyMembersEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.PartyMembersDTO;
-import com.elink.esua.epdc.entity.PartyMembersEntity;
+import com.elink.esua.epdc.user.dto.PartyMembersDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,7 +46,7 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
      * 查询需要修改的组织机构信息
      *
      * @params [deptId]
-     * @return java.util.List<com.elink.esua.epdc.dto.PartyMembersDTO>
+     * @return java.util.List<PartyMembersDTO>
      * @author liuchuang
      * @since 2020/3/7 15:31
      */
@@ -76,7 +76,7 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
     /***
      * 已认证党员查询优化
      * @param
-     * @return java.util.List<com.elink.esua.epdc.dto.PartyMembersDTO>
+     * @return java.util.List<PartyMembersDTO>
      * @author qushutong
      * @date 2020/3/19 13:33
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyStandardBearerApplyDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyStandardBearerApplyDao.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyStandardBearerApplyDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyStandardBearerApplyDao.java
index daaeeb3ff..9145b4fb9 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyStandardBearerApplyDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyStandardBearerApplyDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity;
+import com.elink.esua.epdc.user.entity.PartyStandardBearerApplyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyTagRelationDao.java
old mode 100755
new mode 100644
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyTagRelationDao.java
index 8b9671825..984810041
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/PartyTagRelationDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.PartyTagRelationEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.entity.PartyTagRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserAuthenticateHistoryDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserAuthenticateHistoryDao.java
similarity index 83%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserAuthenticateHistoryDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserAuthenticateHistoryDao.java
index 2461f8c9b..695993e2c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserAuthenticateHistoryDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserAuthenticateHistoryDao.java
@@ -15,14 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserAuthenticateHistoryEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
-import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -36,7 +35,7 @@ import java.util.List;
 public interface UserAuthenticateHistoryDao extends BaseDao<UserAuthenticateHistoryEntity> {
 	/**
 	 * @param userId 用户id
-	 * @return java.util.List<com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity>
+	 * @return java.util.List<UserAuthenticateHistoryEntity>
 	 * @Author yinzuomei
 	 * @Description 根据用户id查询认证历史记录
 	 * @Date 2019/11/21 15:26
@@ -55,7 +54,7 @@ public interface UserAuthenticateHistoryDao extends BaseDao<UserAuthenticateHist
 
 	/**
 	 * @param userId
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<EpdcAuthenticateHistoryResultDTO>>
 	 * @Author yinzuomei
 	 * @Description 用户认证审核历史
 	 * @Date 2019/11/22 13:30
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserCarInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserCarInfoDao.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserCarInfoDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserCarInfoDao.java
index 6cecfa184..de0516282 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserCarInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserCarInfoDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserCarInfoEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.entity.UserCarInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java
similarity index 83%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java
index fe13a7cdb..2c50d399d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java
@@ -15,19 +15,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
-import com.alibaba.druid.sql.visitor.functions.Char;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
-import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.product.result.EpmetUserBaseInfoDTO;
-import com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO;
-import com.elink.esua.epdc.entity.UserEntity;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.UserPartyStandardAppltResultDTO;
+import com.elink.esua.epdc.user.entity.UserEntity;
+import com.elink.esua.epdc.user.dto.CachingUserInfoDTO;
+import com.elink.esua.epdc.user.dto.UserActivePointsResultDTO;
+import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserMatchTagFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO;
+import com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO;
+import com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -47,7 +50,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * 获取个人用户信息
      *
      * @param id
-     * @return com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO
+     * @return EpdcUserInfoResultDTO
      * @author yujintao
      * @date 2019/9/12 15:29
      */
@@ -66,7 +69,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息
      *
      * @param userId
-     * @return com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO
+     * @return EpdcUserRegisterAuditMsgResultDTO
      * @author work@yujt.net.cn
      * @date 2019/9/27 09:14
      */
@@ -85,7 +88,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /**
      * 移动端-社群添加好友列表
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
+     * @return java.util.List<EpdcUserGroupInviteResultDTO>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:25
@@ -96,7 +99,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * 查询用户列表
      *
      * @param params
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/25 16:13
      */
@@ -107,7 +110,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * 待认证党员
      *
      * @params [params]
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author liuchuang
      * @since 2020/3/23 15:59
      */
@@ -148,7 +151,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /***
      * 用户党员待审核列表
      * @param workUserFromDto
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
+     * @return java.util.List<EpdcWorkUserResultDTO>
      * @author qushutong
      * @date 2019/11/18 19:28
      */
@@ -165,7 +168,7 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * @param workUserFromDto
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
+     * @return java.util.List<EpdcWorkUserResultDTO>
      * @Author yinzuomei
      * @Description 获取用户列表：党员认证失败
      * @Date 2019/12/7 11:23
@@ -174,7 +177,7 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * @param gridIdList
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>
+     * @return java.util.List<EpdcGridUserResultDTO>
      * @Author yinzuomei
      * @Description 根据网格id查询网格下所有的用户
      * @Date 2019/12/19 15:05
@@ -186,7 +189,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      *
      * @param wxOpenId
      * @param wxUnionId
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author work@yujt.net.cn
      * @date 2020/2/25 13:54
      */
@@ -195,7 +198,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /**
      * @param openId
      * @param unionId
-     * @return com.elink.esua.epdc.dto.CachingUserInfoDTO
+     * @return CachingUserInfoDTO
      * @Author yinzuomei
      * @Description 获取用户缓存信息
      * @Date 2019/12/18 14:12
@@ -204,7 +207,7 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.dto.CachingUserInfoDTO
+     * @return CachingUserInfoDTO
      * @Author yinzuomei
      * @Description 根据用户id查询CachingUserInfoDTO
      * @Date 2020/1/15 17:43
@@ -216,7 +219,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * 查询需要修改的组织机构信息
      *
      * @params [deptId]
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author liuchuang
      * @since 2020/3/7 15:31
      */
@@ -226,7 +229,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /***
      * 用户不关联网格关系表
      * @param params
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author qushutong
      * @date 2020/3/16 16:18
      */
@@ -237,7 +240,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * 待认证居民
      *
      * @params [params]
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author liuchuang
      * @since 2020/4/1 18:26
      */
@@ -246,7 +249,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /***
      *  已认证居民
      * @param params
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author wanggongfeng
      * @date 2020/5/22 13:18
      */
@@ -255,7 +258,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /***
      *  未认证居民
      * @param params
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author wanggongfeng
      * @date 2020/5/22 13:18
      */
@@ -267,7 +270,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      *
      * @params [params]
      * @param params
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @author wanggongfeng
      * @date 2020/5/22 13:18
      */
@@ -305,7 +308,7 @@ public interface UserDao extends BaseDao<UserEntity> {
     /***
      * 获取积分
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserActivePointsResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserActivePointsResultDTO>
      * @author qushutong
      * @date 2021/9/28 18:30
      */
@@ -413,4 +416,13 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @param userId
      */
     UserPartyStandardAppltResultDTO queryUserPartyApply(@Param("userId") String userId);
+
+    /**
+     * 根据标签过滤用户ID
+     * @param formDto
+     * @return java.util.List<java.lang.String>
+     * @author work@yujt.net.cn
+     * @date 2022/4/28/0028 16:24
+     */
+    List<String> selectFilterUserIdListByTag(EpdcUserMatchTagFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridInvitationCodeDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserGridInvitationCodeDao.java
similarity index 81%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridInvitationCodeDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserGridInvitationCodeDao.java
index 2653b00a1..917c7de77 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridInvitationCodeDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserGridInvitationCodeDao.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserGridInvitationCodeEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
-import com.elink.esua.epdc.entity.UserGridInvitationCodeEntity;
+import com.elink.esua.epdc.user.dto.UserGridInvitationCodeDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -33,7 +33,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface UserGridInvitationCodeDao extends BaseDao<UserGridInvitationCodeEntity> {
 
 	/**
-	 * @return com.elink.esua.epdc.dto.UserGridInvitationCodeDTO
+	 * @return UserGridInvitationCodeDTO
 	 * @param formDto
 	 * @Author yinzuomei
 	 * @Description 根据网格id、邀请人ID查询邀请码
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserGridRelationDao.java
similarity index 86%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserGridRelationDao.java
index cb3a4041c..4465bf24f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserGridRelationDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserGridRelationEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.entity.UserGridRelationEntity;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -39,7 +39,7 @@ public interface UserGridRelationDao extends BaseDao<UserGridRelationEntity> {
      * 获取用户最后一次切换的网格信息
      *
      * @params [userId]
-     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     * @return UserGridRelationDTO
      * @author liuchuang
      * @since 2019/12/6 10:45
      */
@@ -50,7 +50,7 @@ public interface UserGridRelationDao extends BaseDao<UserGridRelationEntity> {
      * 查询需要修改的组织机构信息
      *
      * @params [deptId]
-     * @return java.util.List<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     * @return java.util.List<UserGridRelationDTO>
      * @author liuchuang
      * @since 2020/3/7 15:31
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserInvitationRecordDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserInvitationRecordDao.java
similarity index 85%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserInvitationRecordDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserInvitationRecordDao.java
index cfcba25c9..949d96f0a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserInvitationRecordDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserInvitationRecordDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserInvitationRecordEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
-import com.elink.esua.epdc.entity.UserInvitationRecordEntity;
+import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -37,7 +37,7 @@ public interface UserInvitationRecordDao extends BaseDao<UserInvitationRecordEnt
     /**
      * 获取邀请记录
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
+     * @return java.util.List<EpdcUserGroupInviteResultDTO>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:25
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagDao.java
old mode 100755
new mode 100644
similarity index 85%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagDao.java
index d58684f3d..952a5673a
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserTagEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.UserTagInfo;
-import com.elink.esua.epdc.entity.UserTagEntity;
+import com.elink.esua.epdc.user.dto.UserTagInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -35,7 +35,7 @@ public interface UserTagDao extends BaseDao<UserTagEntity> {
 
 	/**
 	 * @param tagCode
-	 * @return com.elink.esua.epdc.entity.UserTagEntity
+	 * @return UserTagEntity
 	 * @Author yinzuomei
 	 * @Description 根据标签编码查询信息
 	 * @Date 2019/12/17 19:17
@@ -44,7 +44,7 @@ public interface UserTagDao extends BaseDao<UserTagEntity> {
 
 	/**
 	 * @param userId
-	 * @return java.util.List<com.elink.esua.epdc.dto.UserTagInfo>
+	 * @return java.util.List<UserTagInfo>
 	 * @Author yinzuomei
 	 * @Description 根据用户id查询用户标签id用户标签编码
 	 * @Date 2020/2/7 14:17
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagRelationDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java
index 7f77161d7..9eff35984 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagRelationDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserTagRelationEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.entity.UserTagRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserWxFormIdDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserWxFormIdDao.java
similarity index 85%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserWxFormIdDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserWxFormIdDao.java
index 25510e441..27870336d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserWxFormIdDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserWxFormIdDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.UserWxFormIdEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.UserWxFormIdDTO;
-import com.elink.esua.epdc.entity.UserWxFormIdEntity;
+import com.elink.esua.epdc.user.dto.UserWxFormIdDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -33,7 +33,7 @@ public interface UserWxFormIdDao extends BaseDao<UserWxFormIdEntity> {
     /***
      * 获取最新一条formid
      * @param openId
-     * @return com.elink.esua.epdc.dto.UserWxFormIdDTO
+     * @return UserWxFormIdDTO
      * @author qushutong
      * @date 2019/9/26 14:05
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/VolunteerInfoDao.java
similarity index 85%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/VolunteerInfoDao.java
index 275070b7f..ee2f9a71c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/VolunteerInfoDao.java
@@ -15,16 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dao;
+package com.elink.esua.epdc.user.dao;
 
+import com.elink.esua.epdc.user.entity.VolunteerInfoEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
-import com.elink.esua.epdc.dto.product.result.EpmetVolunteerInfoDTO;
-import com.elink.esua.epdc.entity.VolunteerInfoEntity;
+import com.elink.esua.epdc.user.dto.UserTagDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.user.dto.product.result.EpmetVolunteerInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,7 +95,7 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
 
     /**
      * @param id
-     * @return com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO
+     * @return EpdcAdjustVolunteerPointsDTO
      * @Author yinzuomei
      * @Description 积分调整按钮按下, 查询用户信息
      * @Date 2019/12/16 17:54
@@ -112,7 +112,7 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.dto.VolunteerInfoDTO
+     * @return VolunteerInfoDTO
      * @Author yinzuomei
      * @Description 根据用户id查询志愿者信息
      * @Date 2020/2/6 12:25
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/datasources/DataSourceNames.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/datasources/DataSourceNames.java
index 11df75974..887d261fa 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/datasources/DataSourceNames.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.datasources;
+package com.elink.esua.epdc.user.datasources;
 
 /**
  * 增加多数据源，除默认数据源外，每增加一个数据源，添加一个新的常量
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyAuthenticationFailedEntity.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyAuthenticationFailedEntity.java
index 2530a5ec7..040e0530b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyAuthenticationFailedEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyMembersEntity.java
old mode 100755
new mode 100644
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyMembersEntity.java
index c11e6a84f..8870f4211
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyMembersEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyStandardBearerApplyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyStandardBearerApplyEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java
index 5f46a0fb3..beffac69b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyStandardBearerApplyEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyTagRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyTagRelationEntity.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyTagRelationEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyTagRelationEntity.java
index a5231fec1..ed921998e
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyTagRelationEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyTagRelationEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserAuthenticateHistoryEntity.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserAuthenticateHistoryEntity.java
index 3a3b14bf5..8b8e2116a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserAuthenticateHistoryEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserCarInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserCarInfoEntity.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserCarInfoEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserCarInfoEntity.java
index d59419950..1f7fd325a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserCarInfoEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserCarInfoEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java
similarity index 99%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java
index 6abd4a37d..237b7959f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridInvitationCodeEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserGridInvitationCodeEntity.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridInvitationCodeEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserGridInvitationCodeEntity.java
index 951ca3249..912b10771 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridInvitationCodeEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserGridInvitationCodeEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserGridRelationEntity.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserGridRelationEntity.java
index 02d9ea3eb..e6fffe803 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserGridRelationEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserInvitationRecordEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserInvitationRecordEntity.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserInvitationRecordEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserInvitationRecordEntity.java
index 36974bcba..019d74b3b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserInvitationRecordEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserInvitationRecordEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserTagEntity.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserTagEntity.java
index a108b6b9e..819dec287
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserTagEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserTagRelationEntity.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagRelationEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserTagRelationEntity.java
index cf4aa853e..c1d55cfbb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagRelationEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserTagRelationEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserWxFormIdEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserWxFormIdEntity.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserWxFormIdEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserWxFormIdEntity.java
index b5353778e..0320c022a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserWxFormIdEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserWxFormIdEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/VolunteerInfoEntity.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/VolunteerInfoEntity.java
index 0e4ca8176..a541cdb36 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/VolunteerInfoEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.entity;
+package com.elink.esua.epdc.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyAuthenticationFailedExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyAuthenticationFailedExcel.java
index 65ef33b67..c3a8a9a97 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyAuthenticationFailedExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyMembersExcel.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyMembersExcel.java
index a4dadce0c..393c9065d
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyMembersExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyStandardBearerApplyExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyStandardBearerApplyExcel.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyStandardBearerApplyExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyStandardBearerApplyExcel.java
index e1154a7f0..918499660 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyStandardBearerApplyExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyStandardBearerApplyExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyTagRelationExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyTagRelationExcel.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyTagRelationExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyTagRelationExcel.java
index 9b7a9cc94..e56a70cb0
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyTagRelationExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/PartyTagRelationExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserAuthenticateHistoryExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserAuthenticateHistoryExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserAuthenticateHistoryExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserAuthenticateHistoryExcel.java
index 05a38aa8f..3281605e8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserAuthenticateHistoryExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserAuthenticateHistoryExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserCarInfoExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserCarInfoExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserCarInfoExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserCarInfoExcel.java
index f20c86c75..7ad4c1a80 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserCarInfoExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserCarInfoExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserExcel.java
index 8ff963288..56178c7ba 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserGridInvitationCodeExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserGridInvitationCodeExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserGridInvitationCodeExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserGridInvitationCodeExcel.java
index 364675ca4..a2c0d8ea6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserGridInvitationCodeExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserGridInvitationCodeExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserInvitationRecordExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserInvitationRecordExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserInvitationRecordExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserInvitationRecordExcel.java
index 90de41fb6..0c57089b7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserInvitationRecordExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserInvitationRecordExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserTagExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserTagExcel.java
old mode 100755
new mode 100644
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserTagExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserTagExcel.java
index 22abfc7e5..6feb80675
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserTagExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserTagExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserTagRelationExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserTagRelationExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserTagRelationExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserTagRelationExcel.java
index 3e4d1b738..5ed2a8c16 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserTagRelationExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserTagRelationExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserWxFormIdExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserWxFormIdExcel.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserWxFormIdExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserWxFormIdExcel.java
index 76c98bbe6..daf915c6b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserWxFormIdExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/UserWxFormIdExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/VolunteerInfoExcel.java
similarity index 98%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/VolunteerInfoExcel.java
index 2ffc31ddc..751f4d163 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/excel/VolunteerInfoExcel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.excel;
+package com.elink.esua.epdc.user.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/exception/UserModuleErrorCode.java
similarity index 86%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/exception/UserModuleErrorCode.java
index 02ae133b1..f02f81047 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/exception/UserModuleErrorCode.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.exception;
+package com.elink.esua.epdc.user.exception;
 
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AdminFeignClient.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AdminFeignClient.java
index 7655e329c..4c32f520f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AdminFeignClient.java
@@ -1,9 +1,9 @@
-package com.elink.esua.epdc.feign;
+package com.elink.esua.epdc.user.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
+import com.elink.esua.epdc.user.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AnalysisFeignClient.java
similarity index 74%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AnalysisFeignClient.java
index a515af1a5..0f138b92d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/AnalysisFeignClient.java
@@ -1,10 +1,9 @@
-package com.elink.esua.epdc.feign;
+package com.elink.esua.epdc.user.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
-import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
+import com.elink.esua.epdc.user.dto.epdc.form.UserLoginLogDTO;
+import com.elink.esua.epdc.user.feign.fallback.AnalysisFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/NewsFeignClient.java
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/NewsFeignClient.java
index 437288959..eb5a81655 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/NewsFeignClient.java
@@ -1,9 +1,9 @@
-package com.elink.esua.epdc.feign;
+package com.elink.esua.epdc.user.feign;
 
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback;
+import com.elink.esua.epdc.user.feign.fallback.NewsFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/PointFeignClient.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/PointFeignClient.java
similarity index 83%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/PointFeignClient.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/PointFeignClient.java
index 169555acf..72b7809ef 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/PointFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/PointFeignClient.java
@@ -1,9 +1,9 @@
-package com.elink.esua.epdc.feign;
+package com.elink.esua.epdc.user.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.PointLogFormDTO;
-import com.elink.esua.epdc.feign.fallback.PointFeignClientFallback;
+import com.elink.esua.epdc.user.dto.PointLogFormDTO;
+import com.elink.esua.epdc.user.feign.fallback.PointFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AdminFeignClientFallback.java
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AdminFeignClientFallback.java
index 7ec1c523a..94a776767 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AdminFeignClientFallback.java
@@ -1,10 +1,10 @@
-package com.elink.esua.epdc.feign.fallback;
+package com.elink.esua.epdc.user.feign.fallback;
 
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AnalysisFeignClientFallback.java
similarity index 75%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AnalysisFeignClientFallback.java
index 1380ee3c3..e70a775c9 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/AnalysisFeignClientFallback.java
@@ -1,10 +1,10 @@
-package com.elink.esua.epdc.feign.fallback;
+package com.elink.esua.epdc.user.feign.fallback;
 
+import com.elink.esua.epdc.user.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
-import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import com.elink.esua.epdc.user.dto.epdc.form.UserLoginLogDTO;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/NewsFeignClientFallback.java
similarity index 86%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/NewsFeignClientFallback.java
index 9965e8667..1fc85e8f6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/NewsFeignClientFallback.java
@@ -1,10 +1,10 @@
-package com.elink.esua.epdc.feign.fallback;
+package com.elink.esua.epdc.user.feign.fallback;
 
+import com.elink.esua.epdc.user.feign.NewsFeignClient;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.NewsFeignClient;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointFeignClientFallback.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/PointFeignClientFallback.java
similarity index 78%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointFeignClientFallback.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/PointFeignClientFallback.java
index 6cbf47b73..5e3d834ba 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/feign/fallback/PointFeignClientFallback.java
@@ -1,10 +1,10 @@
-package com.elink.esua.epdc.feign.fallback;
+package com.elink.esua.epdc.user.feign.fallback;
 
+import com.elink.esua.epdc.user.feign.PointFeignClient;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.PointLogFormDTO;
-import com.elink.esua.epdc.feign.PointFeignClient;
+import com.elink.esua.epdc.user.dto.PointLogFormDTO;
 import org.springframework.stereotype.Component;
 
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyAuthenticationFailedRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyAuthenticationFailedRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyAuthenticationFailedRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyAuthenticationFailedRedis.java
index c41b64224..31961b589 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyAuthenticationFailedRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyAuthenticationFailedRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyMembersRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyMembersRedis.java
old mode 100755
new mode 100644
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyMembersRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyMembersRedis.java
index 6d3146c7a..7923fd3e1
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyMembersRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyMembersRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyStandardBearerApplyRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyStandardBearerApplyRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyStandardBearerApplyRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyStandardBearerApplyRedis.java
index 5b0cc585b..a9e8375cd 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyStandardBearerApplyRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyStandardBearerApplyRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyTagRelationRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyTagRelationRedis.java
old mode 100755
new mode 100644
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyTagRelationRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyTagRelationRedis.java
index e2bde59e9..09ce15e48
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyTagRelationRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/PartyTagRelationRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserCarInfoRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserCarInfoRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserCarInfoRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserCarInfoRedis.java
index 4dd4a6b2f..6731935fc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserCarInfoRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserCarInfoRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserGridInvitationCodeRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserGridInvitationCodeRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserGridInvitationCodeRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserGridInvitationCodeRedis.java
index 61640c338..c24a5dd14 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserGridInvitationCodeRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserGridInvitationCodeRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserGridRelationRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserGridRelationRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserGridRelationRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserGridRelationRedis.java
index a4487f0e4..7cc105c52 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserGridRelationRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserGridRelationRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserInvitationRecordRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserInvitationRecordRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserInvitationRecordRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserInvitationRecordRedis.java
index ce05cdd22..4e660591a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserInvitationRecordRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserInvitationRecordRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserRedis.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserRedis.java
index 7ad706575..1d137458c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserRedis.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserTagRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserTagRedis.java
old mode 100755
new mode 100644
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserTagRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserTagRedis.java
index df13f0b53..01b354c8c
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserTagRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserTagRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserTagRelationRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserTagRelationRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserTagRelationRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserTagRelationRedis.java
index 8898d3cc5..459452a9e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserTagRelationRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserTagRelationRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserWxFormIdRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserWxFormIdRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserWxFormIdRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserWxFormIdRedis.java
index 5b9ef672d..cac3e7356 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserWxFormIdRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/UserWxFormIdRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/VolunteerInfoRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/VolunteerInfoRedis.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/VolunteerInfoRedis.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/VolunteerInfoRedis.java
index 1c5d99cf0..b76618cce 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/VolunteerInfoRedis.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/redis/VolunteerInfoRedis.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.redis;
+package com.elink.esua.epdc.user.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/rocketmq/consumer/OrganizationModifyConsumer.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/rocketmq/consumer/OrganizationModifyConsumer.java
index ca4106042..ff1a724e0 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/rocketmq/consumer/OrganizationModifyConsumer.java
@@ -1,9 +1,9 @@
-package com.elink.esua.epdc.rocketmq.consumer;
+package com.elink.esua.epdc.user.rocketmq.consumer;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.*;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.MessageModel;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/rocketmq/dto/OrganizationModifyDTO.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/rocketmq/dto/OrganizationModifyDTO.java
index 0fdbe646b..1c910c2c5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/rocketmq/dto/OrganizationModifyDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.rocketmq.dto;
+package com.elink.esua.epdc.user.rocketmq.dto;
 
 import lombok.Data;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyAuthenticationFailedService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyAuthenticationFailedService.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyAuthenticationFailedService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyAuthenticationFailedService.java
index 63d50a8e8..d77c8a249 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyAuthenticationFailedService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyAuthenticationFailedService.java
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.entity.PartyAuthenticationFailedEntity;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
-import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyMembersService.java
old mode 100755
new mode 100644
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyMembersService.java
index ce27fe0d1..1397aa548
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyMembersService.java
@@ -15,15 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.PartyMembersDTO;
-import com.elink.esua.epdc.entity.PartyMembersEntity;
-import com.elink.esua.epdc.entity.UserEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.dto.PartyMembersDTO;
+import com.elink.esua.epdc.user.entity.PartyMembersEntity;
+import com.elink.esua.epdc.user.entity.UserEntity;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -85,7 +85,7 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
     /***
      * 已认证党员
      * @param  params
-     * @return java.util.List<com.elink.esua.epdc.dto.PartyMembersDTO>
+     * @return java.util.List<PartyMembersDTO>
      * @author qushutong
      * @date 2019/12/29 14:47
      */
@@ -114,7 +114,7 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
     /***
      * 已认证党员优化
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<PartyMembersDTO>>
      * @author qushutong
      * @date 2020/3/19 13:36
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyStandardBearerApplyService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyStandardBearerApplyService.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyStandardBearerApplyService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyStandardBearerApplyService.java
index ab2e53979..60acf7866 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyStandardBearerApplyService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyStandardBearerApplyService.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.PartyStandardBearerApplyDTO;
-import com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity;
+import com.elink.esua.epdc.user.dto.PartyStandardBearerApplyDTO;
+import com.elink.esua.epdc.user.entity.PartyStandardBearerApplyEntity;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyTagRelationService.java
old mode 100755
new mode 100644
similarity index 89%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyTagRelationService.java
index 1f9bb16e5..bd88b1aa8
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/PartyTagRelationService.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.PartyTagRelationDTO;
-import com.elink.esua.epdc.entity.PartyTagRelationEntity;
+import com.elink.esua.epdc.user.dto.PartyTagRelationDTO;
+import com.elink.esua.epdc.user.entity.PartyTagRelationEntity;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserAuthenticateHistoryService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserAuthenticateHistoryService.java
similarity index 85%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserAuthenticateHistoryService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserAuthenticateHistoryService.java
index ce8ccd207..c44677c26 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserAuthenticateHistoryService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserAuthenticateHistoryService.java
@@ -15,15 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.entity.UserAuthenticateHistoryEntity;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
-import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
+import com.elink.esua.epdc.user.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -98,7 +98,7 @@ public interface UserAuthenticateHistoryService extends BaseService<UserAuthenti
 
     /**
      * @param userId 用户id
-     * @return java.util.List<com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>
+     * @return java.util.List<UserAuthenticateHistoryDTO>
      * @Author yinzuomei
      * @Description 根据用户id查询认证历史记录
      * @Date 2019/11/21 14:01
@@ -107,7 +107,7 @@ public interface UserAuthenticateHistoryService extends BaseService<UserAuthenti
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcAuthenticateHistoryResultDTO>>
      * @Author yinzuomei
      * @Description 用户认证审核历史
      * @Date 2019/11/22 13:17
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserCarInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserCarInfoService.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserCarInfoService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserCarInfoService.java
index 78e06a08a..ccdbd94ca 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserCarInfoService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserCarInfoService.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
-import com.elink.esua.epdc.entity.UserCarInfoEntity;
+import com.elink.esua.epdc.user.dto.epdc.UserCarInfoDTO;
+import com.elink.esua.epdc.user.entity.UserCarInfoEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -96,7 +96,7 @@ public interface UserCarInfoService extends BaseService<UserCarInfoEntity> {
     /***
      * 根据carNumber
      * @param carNumber
-     * @return com.elink.esua.epdc.dto.epdc.UserCarInfoDTO
+     * @return UserCarInfoDTO
      * @author qushutong
      * @date 2020/2/15 18:42
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridInvitationCodeService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserGridInvitationCodeService.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridInvitationCodeService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserGridInvitationCodeService.java
index 2fcf09cd2..804521f6a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridInvitationCodeService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserGridInvitationCodeService.java
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
-import com.elink.esua.epdc.entity.UserGridInvitationCodeEntity;
+import com.elink.esua.epdc.user.dto.UserGridInvitationCodeDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
+import com.elink.esua.epdc.user.entity.UserGridInvitationCodeEntity;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserGridRelationService.java
similarity index 84%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserGridRelationService.java
index c40097472..072ec6e84 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserGridRelationService.java
@@ -15,17 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.entity.UserGridRelationEntity;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.entity.UserGridRelationEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppRemoveGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -102,7 +102,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * 网格长小程序端切换网格
      *
      * @param switchGridDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserGridRelationDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/23 11:05
      */
@@ -112,7 +112,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * 获取网格长管理的网格列表
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcUserGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:28
      */
@@ -121,7 +121,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
     /**
      * 获取用户绑定网格信息
      *
-     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     * @return UserGridRelationDTO
      * @params [userId, gridId]
      * @author liuchuang
      * @since 2019/10/25 11:21
@@ -132,7 +132,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * 获取用户所有网格
      *
      * @param userId
-     * @return java.util.List<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     * @return java.util.List<UserGridRelationDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/25 18:20
      */
@@ -172,7 +172,7 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * 获取用户最后一次切换的网格信息
      *
      * @params [userId]
-     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     * @return UserGridRelationDTO
      * @author liuchuang
      * @since 2019/12/6 10:47
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserInvitationRecordService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserInvitationRecordService.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserInvitationRecordService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserInvitationRecordService.java
index 3fd70ee2a..22b8ed9af 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserInvitationRecordService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserInvitationRecordService.java
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.UserInvitationRecordDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
-import com.elink.esua.epdc.entity.UserInvitationRecordEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.dto.UserInvitationRecordDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
+import com.elink.esua.epdc.user.entity.UserInvitationRecordEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -97,7 +97,7 @@ public interface UserInvitationRecordService extends BaseService<UserInvitationR
     /**
      * 获取邀请记录
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
+     * @return java.util.List<EpdcUserGroupInviteResultDTO>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:24
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserLoginLogService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserLoginLogService.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserLoginLogService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserLoginLogService.java
index 2d90b57b1..d17de0342 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserLoginLogService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserLoginLogService.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
-import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.UserLoginLogDTO;
 
 /**
  * 用户登录日志表
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java
similarity index 84%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java
index a41c0d459..8b03b5e5f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java
@@ -15,16 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
+import com.elink.esua.epdc.user.dto.*;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.entity.UserEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.entity.UserEntity;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -43,7 +44,7 @@ public interface UserService extends BaseService<UserEntity> {
     /**
      * 待认证党员列表
      *
-     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<UserDTO>
      * @params [params]
      * @author liuchuang
      * @since 2020/3/23 15:57
@@ -57,7 +58,7 @@ public interface UserService extends BaseService<UserEntity> {
     /**
      * 待认证党员导出
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @params [params]
      * @author liuchuang
      * @since 2020/3/23 16:25
@@ -108,7 +109,7 @@ public interface UserService extends BaseService<UserEntity> {
      * 根据用户微信openId获取用户信息
      *
      * @param openId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:01
      */
@@ -118,7 +119,7 @@ public interface UserService extends BaseService<UserEntity> {
      * 根据用户微信unionID获取用户信息
      *
      * @param unionId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:01
      */
@@ -172,7 +173,7 @@ public interface UserService extends BaseService<UserEntity> {
      * 登录前，获取用户信息
      *
      * @param openId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/24 13:57
      */
@@ -183,7 +184,7 @@ public interface UserService extends BaseService<UserEntity> {
      * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterAuditMsgResultDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/27 09:13
      */
@@ -192,7 +193,7 @@ public interface UserService extends BaseService<UserEntity> {
     /**
      * 移动端-社群添加好友列表
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
+     * @return java.util.List<EpdcUserGroupInviteResultDTO>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:24
@@ -203,7 +204,7 @@ public interface UserService extends BaseService<UserEntity> {
      * 网格长注册
      *
      * @param registerDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @author work@yujt.net.cn
      * @date 2019/10/23 09:35
      */
@@ -222,7 +223,7 @@ public interface UserService extends BaseService<UserEntity> {
     /**
      * 保存用户信息或关联网格信息
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterInfoResultDTO>
      * @params [fromDto]
      * @author liuchuang
      * @since 2019/10/25 14:35
@@ -276,7 +277,7 @@ public interface UserService extends BaseService<UserEntity> {
     /***
      * 获取用户列表
      * @param workUserFromDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcWorkUserResultDTO>>
      * @author qushutong
      * @date 2019/11/18 14:00
      */
@@ -294,7 +295,7 @@ public interface UserService extends BaseService<UserEntity> {
     /**
      * 获取用户最后一次切换的网格信息
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcUserRegisterInfoResultDTO>
      * @params [openId]
      * @author liuchuang
      * @since 2019/12/6 10:59
@@ -303,7 +304,7 @@ public interface UserService extends BaseService<UserEntity> {
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @Author yinzuomei
      * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
      * @Date 2019/12/7 13:58
@@ -312,7 +313,7 @@ public interface UserService extends BaseService<UserEntity> {
 
     /**
      * @param gridIdList
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcGridUserResultDTO>>
      * @Author yinzuomei
      * @Description 根据网格id查询网格下所有的用户
      * @Date 2019/12/19 15:03
@@ -344,7 +345,7 @@ public interface UserService extends BaseService<UserEntity> {
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<CachingUserInfoDTO>
      * @Author yinzuomei
      * @Description 获取用户缓存信息
      * @Date 2019/12/18 14:01
@@ -361,7 +362,7 @@ public interface UserService extends BaseService<UserEntity> {
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<CachingUserInfoDTO>
      * @Author yinzuomei
      * @Description 获取用户缓存信息
      * @Date 2020/1/15 17:40
@@ -384,7 +385,7 @@ public interface UserService extends BaseService<UserEntity> {
     /***
      * 所有用户 用来锁定已注册在别的微信里面的信息
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<UserDTO>
      * @author qushutong
      * @date 2020/3/16 10:53
      */
@@ -394,7 +395,7 @@ public interface UserService extends BaseService<UserEntity> {
     /***
      * 已认证列表
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<UserDTO>
      * @author qushutong
      * @date 2020/3/16 16:16
      */
@@ -418,7 +419,7 @@ public interface UserService extends BaseService<UserEntity> {
      * 是否申请过亮党旗
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO>
      * @author LZN
      * @date 2022/4/28 14:23
      */
@@ -434,4 +435,12 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2022/4/28 15:15
      */
     Result StandarBearerApply(String userId, String gridId);
+    /***
+     * 根据标签，过滤符合标签的用户ID
+     * @param formDto
+     * @return java.util.List<java.lang.String>
+     * @author work@yujt.net.cn
+     * @date 2022/4/28/0028 16:08
+     */
+    List<String> filterUserIdListByTag(EpdcUserMatchTagFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagRelationService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java
index 3a377d32a..380ed8150 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagRelationService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.UserTagRelationDTO;
-import com.elink.esua.epdc.entity.UserTagRelationEntity;
+import com.elink.esua.epdc.user.dto.UserTagRelationDTO;
+import com.elink.esua.epdc.user.entity.UserTagRelationEntity;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagService.java
old mode 100755
new mode 100644
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagService.java
index c62f138e4..c1c6b317c
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserTagService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagService.java
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.entity.UserTagEntity;
+import com.elink.esua.epdc.user.dto.UserTagDTO;
+import com.elink.esua.epdc.user.entity.UserTagEntity;
 
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserWxFormIdService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserWxFormIdService.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserWxFormIdService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserWxFormIdService.java
index e3c1f72fb..e785d5604 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserWxFormIdService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserWxFormIdService.java
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.UserWxFormIdDTO;
-import com.elink.esua.epdc.entity.UserWxFormIdEntity;
+import com.elink.esua.epdc.user.dto.UserWxFormIdDTO;
+import com.elink.esua.epdc.user.entity.UserWxFormIdEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -96,7 +96,7 @@ public interface UserWxFormIdService extends BaseService<UserWxFormIdEntity> {
     /***
      *  获取最新一条formid
      * @param openId
-     * @return com.elink.esua.epdc.dto.UserWxFormIdDTO
+     * @return UserWxFormIdDTO
      * @author qushutong
      * @date 2019/9/26 14:03
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/VolunteerInfoService.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/VolunteerInfoService.java
index 2a410661c..ed675a8c5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/VolunteerInfoService.java
@@ -15,19 +15,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service;
+package com.elink.esua.epdc.user.service;
 
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
-import com.elink.esua.epdc.entity.VolunteerInfoEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.dto.UserTagDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.user.entity.VolunteerInfoEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -153,7 +153,7 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcAdjustVolunteerPointsDTO>
      * @Author yinzuomei
      * @Description 积分调整按钮按下,查询用户信息
      * @Date 2019/12/16 17:48
@@ -179,7 +179,7 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.VolunteerInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<VolunteerInfoDTO>
      * @Author yinzuomei
      * @Description 根据用户id查询志愿者信息
      * @Date 2020/2/6 12:23
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyAuthenticationFailedServiceImpl.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyAuthenticationFailedServiceImpl.java
index 16a8fb211..13764e7a0 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyAuthenticationFailedServiceImpl.java
@@ -15,22 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.datasources.DataSourceNames;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao;
-import com.elink.esua.epdc.datasources.DataSourceNames;
-import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
-import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
-import com.elink.esua.epdc.util.AppUserUtils;
-import org.apache.commons.lang3.StringUtils;
+import com.elink.esua.epdc.user.dao.PartyAuthenticationFailedDao;
+import com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO;
+import com.elink.esua.epdc.user.entity.PartyAuthenticationFailedEntity;
+import com.elink.esua.epdc.user.service.PartyAuthenticationFailedService;
+import com.elink.esua.epdc.user.util.AppUserUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -128,7 +127,7 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
      * 组织机构信息处理
      *
      * @params [dto, partyList]
-     * @return java.util.List<com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity>
+     * @return java.util.List<PartyAuthenticationFailedEntity>
      * @author liuchuang
      * @since 2020/3/7 15:13
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyMembersServiceImpl.java
old mode 100755
new mode 100644
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyMembersServiceImpl.java
index e2353204d..9f6e61179
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyMembersServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
@@ -23,6 +23,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.datasources.DataSourceNames;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.service.PartyMembersService;
+import com.elink.esua.epdc.user.service.PartyTagRelationService;
 import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -35,22 +39,18 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.StreamUtils;
-import com.elink.esua.epdc.constant.UserFieldConsant;
-import com.elink.esua.epdc.dao.PartyMembersDao;
-import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.user.constant.UserFieldConsant;
+import com.elink.esua.epdc.user.dao.PartyMembersDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.PartyMembersDTO;
-import com.elink.esua.epdc.dto.PartyTagRelationDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcPartyErroyResultDTO;
-import com.elink.esua.epdc.entity.PartyMembersEntity;
-import com.elink.esua.epdc.entity.UserEntity;
-import com.elink.esua.epdc.enums.PartyMemberRegFlagEnum;
-import com.elink.esua.epdc.excel.PartyMembersExcel;
-import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.PartyMembersService;
-import com.elink.esua.epdc.service.PartyTagRelationService;
-import com.elink.esua.epdc.util.AppUserUtils;
+import com.elink.esua.epdc.user.dto.PartyMembersDTO;
+import com.elink.esua.epdc.user.dto.PartyTagRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcPartyErroyResultDTO;
+import com.elink.esua.epdc.user.entity.PartyMembersEntity;
+import com.elink.esua.epdc.user.entity.UserEntity;
+import com.elink.esua.epdc.user.enums.PartyMemberRegFlagEnum;
+import com.elink.esua.epdc.user.excel.PartyMembersExcel;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import com.elink.esua.epdc.user.util.AppUserUtils;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +103,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
      *
      * @param params             分页参数
      * @param allPartyMemberFlag 是否是党员库查询
-     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyMembersDTO>
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<PartyMembersDTO>
      * @author work@yujt.net.cn
      * @date 2020/2/24 16:41
      */
@@ -507,7 +507,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     /**
      * 组织机构信息处理
      *
-     * @return java.util.List<com.elink.esua.epdc.entity.PartyMembersEntity>
+     * @return java.util.List<PartyMembersEntity>
      * @params [dto, partyList]
      * @author liuchuang
      * @since 2020/3/7 15:17
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyStandardBearerApplyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyStandardBearerApplyServiceImpl.java
similarity index 90%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyStandardBearerApplyServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyStandardBearerApplyServiceImpl.java
index 08643ef54..48ccf45b0 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyStandardBearerApplyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyStandardBearerApplyServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,11 +23,11 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.dao.PartyStandardBearerApplyDao;
-import com.elink.esua.epdc.dto.PartyStandardBearerApplyDTO;
-import com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity;
-import com.elink.esua.epdc.redis.PartyStandardBearerApplyRedis;
-import com.elink.esua.epdc.service.PartyStandardBearerApplyService;
+import com.elink.esua.epdc.user.dao.PartyStandardBearerApplyDao;
+import com.elink.esua.epdc.user.dto.PartyStandardBearerApplyDTO;
+import com.elink.esua.epdc.user.entity.PartyStandardBearerApplyEntity;
+import com.elink.esua.epdc.user.redis.PartyStandardBearerApplyRedis;
+import com.elink.esua.epdc.user.service.PartyStandardBearerApplyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyTagRelationServiceImpl.java
old mode 100755
new mode 100644
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyTagRelationServiceImpl.java
index 7f1847362..7340d99ca
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyTagRelationServiceImpl.java
@@ -15,19 +15,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.service.PartyTagRelationService;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.dao.PartyTagRelationDao;
-import com.elink.esua.epdc.dto.PartyTagRelationDTO;
-import com.elink.esua.epdc.entity.PartyTagRelationEntity;
-import com.elink.esua.epdc.redis.PartyTagRelationRedis;
-import com.elink.esua.epdc.service.PartyTagRelationService;
+import com.elink.esua.epdc.user.dao.PartyTagRelationDao;
+import com.elink.esua.epdc.user.dto.PartyTagRelationDTO;
+import com.elink.esua.epdc.user.entity.PartyTagRelationEntity;
+import com.elink.esua.epdc.user.redis.PartyTagRelationRedis;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserAuthenticateHistoryServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserAuthenticateHistoryServiceImpl.java
similarity index 87%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserAuthenticateHistoryServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserAuthenticateHistoryServiceImpl.java
index 0a6319d95..092ae271c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserAuthenticateHistoryServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserAuthenticateHistoryServiceImpl.java
@@ -15,23 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.datasources.DataSourceNames;
 import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
-import com.elink.esua.epdc.datasources.DataSourceNames;
-import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
-import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
-import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
+import com.elink.esua.epdc.user.dao.UserAuthenticateHistoryDao;
+import com.elink.esua.epdc.user.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
+import com.elink.esua.epdc.user.entity.UserAuthenticateHistoryEntity;
+import com.elink.esua.epdc.user.service.UserAuthenticateHistoryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,7 +105,7 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
 
     /**
      * @param userId 用户id
-     * @return java.util.List<com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>
+     * @return java.util.List<UserAuthenticateHistoryDTO>
      * @Author yinzuomei
      * @Description 根据用户id查询认证历史记录
      * @Date 2019/11/21 14:01
@@ -118,7 +118,7 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcAuthenticateHistoryResultDTO>>
      * @Author yinzuomei
      * @Description 用户认证审核历史
      * @Date 2019/11/22 13:17
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserCarInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserCarInfoServiceImpl.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserCarInfoServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserCarInfoServiceImpl.java
index fb301bb6c..be4541ba5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserCarInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserCarInfoServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,11 +23,11 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.dao.UserCarInfoDao;
-import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
-import com.elink.esua.epdc.entity.UserCarInfoEntity;
-import com.elink.esua.epdc.redis.UserCarInfoRedis;
-import com.elink.esua.epdc.service.UserCarInfoService;
+import com.elink.esua.epdc.user.dao.UserCarInfoDao;
+import com.elink.esua.epdc.user.dto.epdc.UserCarInfoDTO;
+import com.elink.esua.epdc.user.entity.UserCarInfoEntity;
+import com.elink.esua.epdc.user.redis.UserCarInfoRedis;
+import com.elink.esua.epdc.user.service.UserCarInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridInvitationCodeServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserGridInvitationCodeServiceImpl.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridInvitationCodeServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserGridInvitationCodeServiceImpl.java
index 11b7cc696..9f1f64c88 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridInvitationCodeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserGridInvitationCodeServiceImpl.java
@@ -15,21 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.service.UserGridInvitationCodeService;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dao.UserGridInvitationCodeDao;
-import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
-import com.elink.esua.epdc.entity.UserGridInvitationCodeEntity;
-import com.elink.esua.epdc.redis.UserGridInvitationCodeRedis;
-import com.elink.esua.epdc.service.UserGridInvitationCodeService;
+import com.elink.esua.epdc.user.dao.UserGridInvitationCodeDao;
+import com.elink.esua.epdc.user.dto.UserGridInvitationCodeDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
+import com.elink.esua.epdc.user.entity.UserGridInvitationCodeEntity;
+import com.elink.esua.epdc.user.redis.UserGridInvitationCodeRedis;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserGridRelationServiceImpl.java
similarity index 94%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserGridRelationServiceImpl.java
index dcff68adc..7e0b06b60 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserGridRelationServiceImpl.java
@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
@@ -27,15 +28,14 @@ import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.constant.UserFieldConsant;
-import com.elink.esua.epdc.dao.UserGridRelationDao;
-import com.elink.esua.epdc.dto.UserGridRelationDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.entity.UserGridRelationEntity;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.UserGridRelationService;
+import com.elink.esua.epdc.user.constant.UserFieldConsant;
+import com.elink.esua.epdc.user.dao.UserGridRelationDao;
+import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppRemoveGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
+import com.elink.esua.epdc.user.entity.UserGridRelationEntity;
+import com.elink.esua.epdc.user.service.UserGridRelationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -238,7 +238,7 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
      * 组织机构信息处理
      *
      * @params [dto, gridList]
-     * @return java.util.List<com.elink.esua.epdc.entity.UserGridRelationEntity>
+     * @return java.util.List<UserGridRelationEntity>
      * @author liuchuang
      * @since 2020/3/7 15:25
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserInvitationRecordServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserInvitationRecordServiceImpl.java
similarity index 88%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserInvitationRecordServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserInvitationRecordServiceImpl.java
index 9902181d1..e331ecbdc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserInvitationRecordServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserInvitationRecordServiceImpl.java
@@ -15,27 +15,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.dao.UserInvitationRecordDao;
-import com.elink.esua.epdc.dto.UserInvitationRecordDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
-import com.elink.esua.epdc.entity.UserInvitationRecordEntity;
-import com.elink.esua.epdc.redis.UserInvitationRecordRedis;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.UserInvitationRecordService;
+import com.elink.esua.epdc.user.dao.UserInvitationRecordDao;
+import com.elink.esua.epdc.user.dto.UserInvitationRecordDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
+import com.elink.esua.epdc.user.entity.UserInvitationRecordEntity;
+import com.elink.esua.epdc.user.redis.UserInvitationRecordRedis;
+import com.elink.esua.epdc.user.service.UserInvitationRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserLoginLogServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserLoginLogServiceImpl.java
similarity index 83%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserLoginLogServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserLoginLogServiceImpl.java
index 1c90c7171..82f64f87b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserLoginLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserLoginLogServiceImpl.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
-import com.elink.esua.epdc.dto.epdc.form.UserLoginLogDTO;
-import com.elink.esua.epdc.feign.AnalysisFeignClient;
-import com.elink.esua.epdc.service.UserLoginLogService;
+import com.elink.esua.epdc.user.dto.epdc.form.UserLoginLogDTO;
+import com.elink.esua.epdc.user.feign.AnalysisFeignClient;
+import com.elink.esua.epdc.user.service.UserLoginLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
similarity index 96%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
index b40284f07..f01d80662 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
@@ -25,9 +25,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.user.dao.PartyStandardBearerApplyDao;
+import com.elink.esua.epdc.user.dao.UserDao;
+import com.elink.esua.epdc.user.datasources.DataSourceNames;
+import com.elink.esua.epdc.user.dto.*;
+import com.elink.esua.epdc.user.dto.PointLogFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
+import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.UserPartyStandardAppltResultDTO;
+import com.elink.esua.epdc.user.entity.*;
+import com.elink.esua.epdc.user.exception.UserModuleErrorCode;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.service.*;
 import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum;
-import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@@ -38,30 +51,25 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.*;
-import com.elink.esua.epdc.constant.AuthenticatedConsant;
-import com.elink.esua.epdc.constant.UserFieldConsant;
-import com.elink.esua.epdc.dao.*;
-import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.user.constant.AuthenticatedConsant;
+import com.elink.esua.epdc.user.constant.UserFieldConsant;
+import com.elink.esua.epdc.user.dao.PartyAuthenticationFailedDao;
+import com.elink.esua.epdc.user.dao.PartyMembersDao;
+import com.elink.esua.epdc.user.dao.UserAuthenticateHistoryDao;
 import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
-import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
-import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.product.result.EpmetUserBaseInfoDTO;
-import com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO;
-import com.elink.esua.epdc.entity.*;
-import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
-import com.elink.esua.epdc.enums.AppUserStatesEnum;
-import com.elink.esua.epdc.enums.PartyMemberRegFlagEnum;
-import com.elink.esua.epdc.excel.UserExcel;
-import com.elink.esua.epdc.exception.UserModuleErrorCode;
-import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.feign.PointFeignClient;
-import com.elink.esua.epdc.redis.UserRedis;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.*;
-import com.elink.esua.epdc.util.AppUserUtils;
+import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
+import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
+import com.elink.esua.epdc.user.dto.epdc.UserCarInfoDTO;
+import com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO;
+import com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO;
+import com.elink.esua.epdc.user.enums.AppUserAuditStateEnum;
+import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
+import com.elink.esua.epdc.user.enums.PartyMemberRegFlagEnum;
+import com.elink.esua.epdc.user.excel.UserExcel;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
+import com.elink.esua.epdc.user.feign.PointFeignClient;
+import com.elink.esua.epdc.user.redis.UserRedis;
+import com.elink.esua.epdc.user.util.AppUserUtils;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -814,7 +822,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @param completeAppUser
      * @param userGridRelation
      * @param parentAndAllDeptDTO
-     * @return com.elink.esua.epdc.entity.UserEntity
+     * @return UserEntity
      * @author rongchao
      * @since 2019-12-19
      */
@@ -1266,7 +1274,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<UserDTO>
      * @Author yinzuomei
      * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
      * @Date 2019/12/7 13:58
@@ -1280,8 +1288,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
 
     /**
-     * @param gridIdList
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO>>
+     * @param gridIdList <<<<<<< Updated upstream:esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < EpdcGridUserResultDTO>>
+     * >>>>>>> Stashed changes:esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
      * @Author yinzuomei
      * @Description 根据网格id查询网格下所有的用户
      * @Date 2019/12/19 15:03
@@ -1332,7 +1341,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<CachingUserInfoDTO>
      * @Author yinzuomei
      * @Description 获取用户缓存信息
      * @Date 2019/12/18 14:01
@@ -1375,7 +1384,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<CachingUserInfoDTO>
      * @Author yinzuomei
      * @Description 获取用户缓存信息
      * @Date 2020/1/15 17:40
@@ -1394,7 +1403,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      *
      * @param openId
      * @param unionId
-     * @return com.elink.esua.epdc.dto.UserDTO
+     * @return UserDTO
      * @author work@yujt.net.cn
      * @date 2019/12/7 17:19
      */
@@ -1426,7 +1435,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @param userId     用户id，不能为空
      * @param identityNo 身份证号，可为空
      * @param mobile     手机号码，可为空
-     * @return com.elink.esua.epdc.entity.UserEntity
+     * @return UserEntity
      * @author work@yujt.net.cn
      * @date 2020/2/25 15:05
      */
@@ -1644,7 +1653,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     /**
      * 组织机构信息处理
      *
-     * @return java.util.List<com.elink.esua.epdc.entity.UserEntity>
+     * @return java.util.List<UserEntity>
      * @params [dto, userList]
      * @author liuchuang
      * @since 2020/3/7 15:22
@@ -1793,7 +1802,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * 是否申请过亮党旗
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.StandardBearerStatusResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO>
      * @author LZN
      * @date 2022/4/28 14:24
      */
@@ -1840,7 +1849,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     /**
      * 用户信息校验
      *
-     * @return com.elink.esua.epdc.dto.UserDTO
+     * @return UserDTO
      * @params [dto]
      * @author liuchuang
      * @since 2020/3/23 18:23
@@ -1887,7 +1896,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     /**
      * 获取党员信息
      *
-     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @return java.util.List<UserDTO>
      * @params [realName, identityNo]
      * @author liuchuang
      * @since 2020/3/23 18:35
@@ -1938,4 +1947,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         partyMembersDao.insert(entity);
     }
 
+    @Override
+    public List<String> filterUserIdListByTag(EpdcUserMatchTagFormDTO formDto) {
+        if (StringUtils.isBlank(formDto.getUserTagValue()) || CollUtil.isEmpty(formDto.getUserIdList())) {
+            return Lists.newArrayList();
+        }
+        return baseDao.selectFilterUserIdListByTag(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java
similarity index 91%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagRelationServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java
index 5ff813ff1..ebd89724f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java
@@ -15,25 +15,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.user.service.UserTagRelationService;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.dao.UserTagDao;
-import com.elink.esua.epdc.dao.UserTagRelationDao;
-import com.elink.esua.epdc.dto.UserTagInfo;
-import com.elink.esua.epdc.dto.UserTagRelationDTO;
-import com.elink.esua.epdc.entity.UserTagEntity;
-import com.elink.esua.epdc.entity.UserTagRelationEntity;
-import com.elink.esua.epdc.redis.UserTagRelationRedis;
-import com.elink.esua.epdc.service.UserTagRelationService;
+import com.elink.esua.epdc.user.dao.UserTagDao;
+import com.elink.esua.epdc.user.dao.UserTagRelationDao;
+import com.elink.esua.epdc.user.dto.UserTagInfo;
+import com.elink.esua.epdc.user.dto.UserTagRelationDTO;
+import com.elink.esua.epdc.user.entity.UserTagEntity;
+import com.elink.esua.epdc.user.entity.UserTagRelationEntity;
+import com.elink.esua.epdc.user.redis.UserTagRelationRedis;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagServiceImpl.java
old mode 100755
new mode 100644
similarity index 93%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagServiceImpl.java
index 0745c353a..c02b9bdff
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -24,11 +24,11 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dao.UserTagDao;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.entity.UserTagEntity;
-import com.elink.esua.epdc.redis.UserTagRedis;
-import com.elink.esua.epdc.service.UserTagService;
+import com.elink.esua.epdc.user.dao.UserTagDao;
+import com.elink.esua.epdc.user.dto.UserTagDTO;
+import com.elink.esua.epdc.user.entity.UserTagEntity;
+import com.elink.esua.epdc.user.redis.UserTagRedis;
+import com.elink.esua.epdc.user.service.UserTagService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserWxFormIdServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserWxFormIdServiceImpl.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserWxFormIdServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserWxFormIdServiceImpl.java
index b5ee73819..14ce091d2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserWxFormIdServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserWxFormIdServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,10 +23,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.dao.UserWxFormIdDao;
-import com.elink.esua.epdc.dto.UserWxFormIdDTO;
-import com.elink.esua.epdc.entity.UserWxFormIdEntity;
-import com.elink.esua.epdc.service.UserWxFormIdService;
+import com.elink.esua.epdc.user.dao.UserWxFormIdDao;
+import com.elink.esua.epdc.user.dto.UserWxFormIdDTO;
+import com.elink.esua.epdc.user.entity.UserWxFormIdEntity;
+import com.elink.esua.epdc.user.service.UserWxFormIdService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/VolunteerInfoServiceImpl.java
similarity index 92%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/VolunteerInfoServiceImpl.java
index 02b7079ca..79aebbc18 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/VolunteerInfoServiceImpl.java
@@ -15,14 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.service.impl;
+package com.elink.esua.epdc.user.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.elink.esua.epdc.async.NewsTask;
+import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.user.service.UserTagRelationService;
+import com.elink.esua.epdc.user.service.VolunteerInfoService;
+import com.elink.esua.epdc.user.async.NewsTask;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -31,25 +33,20 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.constant.UserFieldConsant;
-import com.elink.esua.epdc.constant.VolunteerInfoNoticeConstant;
-import com.elink.esua.epdc.dao.VolunteerInfoDao;
+import com.elink.esua.epdc.user.constant.UserFieldConsant;
+import com.elink.esua.epdc.user.constant.VolunteerInfoNoticeConstant;
+import com.elink.esua.epdc.user.dao.VolunteerInfoDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.user.dto.UserTagDTO;
+import com.elink.esua.epdc.user.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
-import com.elink.esua.epdc.dto.product.result.EpmetVolunteerInfoDTO;
-import com.elink.esua.epdc.entity.UserTagEntity;
-import com.elink.esua.epdc.entity.UserTagRelationEntity;
-import com.elink.esua.epdc.entity.VolunteerInfoEntity;
-import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.service.UserTagRelationService;
-import com.elink.esua.epdc.service.VolunteerInfoService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.user.dto.product.result.EpmetVolunteerInfoDTO;
+import com.elink.esua.epdc.user.entity.VolunteerInfoEntity;
+import com.elink.esua.epdc.user.feign.AdminFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -270,7 +267,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * @param id
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<EpdcAdjustVolunteerPointsDTO>
      * @Author yinzuomei
      * @Description 积分调整按钮按下, 查询用户信息
      * @Date 2019/12/16 17:48
@@ -319,7 +316,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.VolunteerInfoDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<VolunteerInfoDTO>
      * @Author yinzuomei
      * @Description 根据用户id查询志愿者信息
      * @Date 2020/2/6 12:23
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/util/AppUserUtils.java
similarity index 97%
rename from esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java
rename to esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/util/AppUserUtils.java
index eb892fb90..cc2b7970f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/util/AppUserUtils.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.util;
+package com.elink.esua.epdc.user.util;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml
index 342e9b6c5..51429dcd2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml
@@ -133,7 +133,7 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.elink.esua.epdc" level="INFO"/>
-        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <logger name="com.elink.esua.epdc.user.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
index 29b7f2523..b7c71adbb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.PartyAuthenticationFailedDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.PartyAuthenticationFailedDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity" id="partyAuthenticationFailedMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.PartyAuthenticationFailedEntity" id="partyAuthenticationFailedMap">
         <result property="id" column="ID"/>
         <result property="realName" column="REAL_NAME"/>
         <result property="mobile" column="MOBILE"/>
@@ -31,7 +31,7 @@
         <result property="address" column="ADDRESS"/>
     </resultMap>
 
-    <select id="selectListDto" resultType="com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO">
+    <select id="selectListDto" resultType="com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO">
         SELECT
           epaf.ID,
           epaf.REAL_NAME,
@@ -56,7 +56,7 @@
         epaf.CREATED_TIME desc
     </select>
 
-    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO">
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO">
         SELECT
             ID,
             PARENT_DEPT_IDS,
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index f41ad4fcf..8ebccc465 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.PartyMembersDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.PartyMembersDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.PartyMembersEntity" id="partyMembersMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.PartyMembersEntity" id="partyMembersMap">
         <result property="id" column="ID"/>
         <result property="realName" column="REAL_NAME"/>
         <result property="mobile" column="MOBILE"/>
@@ -28,7 +28,7 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
     <!--管理系统 列表-->
-    <select id="pageDIY" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="pageDIY" resultType="com.elink.esua.epdc.user.dto.PartyMembersDTO">
         SELECT
         pm.CADRE_FLAG,
         pm.CREATED_BY,pm.CREATED_TIME,
@@ -86,7 +86,7 @@
         pm.CREATED_TIME DESC
     </select>
 
-    <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.user.dto.PartyMembersDTO">
         SELECT
         pm.CADRE_FLAG, pm.CREATED_BY,eu.CREATED_TIME, pm.DEPT_ID,
         pm.ID,eu.IDENTITY_NO,eu.MOBILE,pm.POST,
@@ -120,7 +120,7 @@
     </select>
 
     <!--管理系统-->
-    <select id="selectByIdNew" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="selectByIdNew" resultType="com.elink.esua.epdc.user.dto.PartyMembersDTO">
 		SELECT
             pm.*,
             pm.ALL_DEPT_IDS as deptStrIds,
@@ -137,7 +137,7 @@
             pm.ID;
     </select>
 
-    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.user.dto.PartyMembersDTO">
         SELECT
             ID,
             PARENT_DEPT_IDS,
@@ -271,10 +271,12 @@
         <if test="gridId != '' and gridId != null">
             and (uu.dept_id = #{gridId} OR find_in_set(#{gridId},uu.ALL_DEPT_IDS))
         </if>
-        AND uu.DEPT_ID IN
-        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
-            #{deptId}
-        </foreach>
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND uu.DEPT_ID IN
+            <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
         ) user
         where
         user.AUTHENTICATED_TYPE='1' and  user.AUTHENTICATED_FLAG = '1'
@@ -282,7 +284,7 @@
 
     </select>
     <!--已认证党员填充数据-->
-    <select id="optimizeHasAuthenticationPartyPageInfo" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="optimizeHasAuthenticationPartyPageInfo" resultType="com.elink.esua.epdc.user.dto.PartyMembersDTO">
         SELECT
             pm.CADRE_FLAG,
             pm.CREATED_BY,
@@ -326,7 +328,7 @@
         ORDER BY
             allu.registTime DESC
     </select>
-    <select id="optimizeHasAuthenticationPartyPageInfoNew" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+    <select id="optimizeHasAuthenticationPartyPageInfoNew" resultType="com.elink.esua.epdc.user.dto.PartyMembersDTO">
         SELECT
         pm.CADRE_FLAG,
         pm.CREATED_BY,
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyStandardBearerApplyDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyStandardBearerApplyDao.xml
index 9f23d9ca8..9238bff4f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyStandardBearerApplyDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyStandardBearerApplyDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.PartyStandardBearerApplyDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.PartyStandardBearerApplyDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.PartyStandardBearerApplyEntity" id="partyStandardBearerApplyMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.PartyStandardBearerApplyEntity" id="partyStandardBearerApplyMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="realName" column="REAL_NAME"/>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml
index c559c0dbb..802107402 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.PartyTagRelationDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.PartyTagRelationDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.PartyTagRelationEntity" id="partyTagRelationMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.PartyTagRelationEntity" id="partyTagRelationMap">
         <result property="id" column="ID"/>
         <result property="partyId" column="PARTY_ID"/>
         <result property="tagId" column="TAG_ID"/>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml
index 369846925..5e139acaf 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserAuthenticateHistoryDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserAuthenticateHistoryDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity" id="userAuthenticateHistoryMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.UserAuthenticateHistoryEntity" id="userAuthenticateHistoryMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="mobile" column="MOBILE"/>
@@ -42,7 +42,7 @@
     </select>
 
     <!-- 用户认证审核历史 -->
-    <select id="selectListAuthenticateHistory" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO">
+    <select id="selectListAuthenticateHistory" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcAuthenticateHistoryResultDTO">
        select m.USER_ID as userId,
             m.MOBILE as mobile,
             m.ADDRESS as address,
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserCarInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserCarInfoDao.xml
index d67f0e94a..b1df1014c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserCarInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserCarInfoDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserCarInfoDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserCarInfoDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.UserCarInfoEntity" id="userCarInfoMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.UserCarInfoEntity" id="userCarInfoMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="carNumber" column="CAR_NUMBER"/>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index edffb67a8..2a0dfa303 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserDao">
 
     <delete id="deleteAuditFailureByOpenId">
         DELETE FROM epdc_user WHERE WX_OPEN_ID = #{wxOpenId} AND STATE = '2'
     </delete>
 
-    <select id="selectOneInfoById" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO">
+    <select id="selectOneInfoById" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO">
          SELECT
             eu.ID AS id,
             eu.NICKNAME AS nickname,
@@ -43,7 +43,7 @@
     </select>
 
     <select id="getUserRegisterAuditResult"
-            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO">
+            resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO">
         SELECT
             u.ID,
             u.MOBILE,
@@ -64,7 +64,7 @@
             ORDER BY f.CREATED_TIME DESC
             LIMIT 1
     </select>
-    <select id="selectListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectListUserDto" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         SELECT
         u.id,
         u.REAL_NAME,
@@ -112,7 +112,7 @@
     </select>
     <!--  根据userId获取居民详情（已认证或待认证（提交信息待审核）的居民用户）  -->
     <resultMap id="EpdcResidentDetailResultDtoMap"
-               type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
+               type="com.elink.esua.epdc.user.dto.epdc.result.EpdcResidentDetailResultDTO">
         <id column="id" property="userId"/>
         <result column="REAL_NAME" property="realName"/>
         <result column="IDENTITY_NO" property="identityNo"/>
@@ -122,7 +122,7 @@
         <result column="PARTY_FLAG" property="partyFlag"/>
         <result column="state" property="state"/>
         <result column="mobile" property="mobile"/>
-        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
+        <collection property="gridList" ofType="com.elink.esua.epdc.user.dto.epdc.result.EpdcResidentDetailGridResultDTO">
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
         </collection>
@@ -150,7 +150,7 @@
             AND eu.id =#{userId}
     </select>
 
-    <select id="selectListOfInviteUsers" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO">
+    <select id="selectListOfInviteUsers" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGroupInviteResultDTO">
         SELECT
         u.ID AS userId,
         u.NICKNAME,
@@ -183,7 +183,7 @@
         u.REGISTER_TIME
     </select>
 
-    <resultMap id="partMemberDetail" type="com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto">
+    <resultMap id="partMemberDetail" type="com.elink.esua.epdc.user.dto.epdc.result.EpdcPartyMemberDetailDto">
         <id column="userId" property="userId"/>
         <result column="realName" property="realName"/>
         <result column="identityNo" property="identityNo"/>
@@ -196,7 +196,7 @@
         <result column="gridName" property="gridName"/>
         <result column="partyFlag" property="partyFlag"/>
         <result column="cadreFlag" property="cadreFlag"/>
-        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
+        <collection property="gridList" ofType="com.elink.esua.epdc.user.dto.epdc.result.EpdcResidentDetailGridResultDTO">
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
         </collection>
@@ -279,7 +279,7 @@
     </select>
 
     <!--获取用户列表-->
-    <select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectWorkUserList" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         u.ID as userId,
         u.NICKNAME as nickname,
@@ -362,8 +362,8 @@
 
     <!--  获取用户列表：党员认证失败  -->
     <select id="selectPartyAuthenticationFailedList"
-            parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO"
-            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+            parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO"
+            resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         u.ID as userId,
         u.NICKNAME as nickname,
@@ -399,7 +399,7 @@
 
     <!-- 根据网格id查询网格下所有的用户 -->
     <select id="selectListGridUserResultDTO" parameterType="map"
-            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO">
+            resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcGridUserResultDTO">
         SELECT
         eu.id AS userId,
         eu.NICKNAME,
@@ -425,7 +425,7 @@
         </if>
     </select>
 
-    <select id="selectListUserByWxForLogin" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectListUserByWxForLogin" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         SELECT
         u.ID, u.NICKNAME, u.FACE_IMG, u.MOBILE, u.PARTY_FLAG, u.REAL_NAME, u.SEX, u.STATE, ur.GRID_ID, ur.GRID
         FROM
@@ -439,7 +439,7 @@
         ur.SWITCHED_TIME DESC
     </select>
 
-    <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.dto.CachingUserInfoDTO">
+    <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.user.dto.CachingUserInfoDTO">
         <result property="userId" column="ID"/>
         <result property="nickname" column="NICKNAME"/>
         <result property="mobile" column="MOBILE"/>
@@ -450,7 +450,7 @@
         <result property="remark" column="REMARK"/>
         <result property="gridId" column="gridId"/>
         <result property="grid" column="grid"/>
-        <collection property="userTagInfos" select="com.elink.esua.epdc.dao.UserTagDao.selectByUserId"
+        <collection property="userTagInfos" select="com.elink.esua.epdc.user.dao.UserTagDao.selectByUserId"
                     column="id">
         </collection>
     </resultMap>
@@ -524,7 +524,7 @@
             eu.DEL_FLAG = '0'
             and eu.id=#{userId}
     </select>
-    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         SELECT
             ID,
             PARENT_DEPT_IDS,
@@ -538,7 +538,7 @@
     </select>
 
 
-    <select id="selectAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectAuthenticatedListUserDto" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         SELECT
         u.id,
         u.REAL_NAME,
@@ -578,7 +578,7 @@
         ORDER BY
         u.register_time desc
     </select>
-    <select id="selectAuthenticatedListUserDtoByList" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectAuthenticatedListUserDtoByList" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         SELECT
         USER.DEPT_ID,
         USER.ID,
@@ -704,7 +704,7 @@
         USER.register_time DESC
     </select>
 
-    <select id="selectWaitAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectWaitAuthenticatedListUserDto" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         SELECT
         user.DEPT_ID,
         user.ID,
@@ -816,7 +816,7 @@
         ORDER BY
         user.register_time DESC
     </select>
-    <select id="selectListUserDtoByList" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectListUserDtoByList" resultType="com.elink.esua.epdc.user.dto.UserDTO">
 
         SELECT
         user.DEPT_ID,
@@ -927,7 +927,7 @@
 
     </select>
 
-    <select id="selectFaildAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectFaildAuthenticatedListUserDto" resultType="com.elink.esua.epdc.user.dto.UserDTO">
        <!-- SELECT
         u.id,
         u.REAL_NAME,
@@ -1111,7 +1111,7 @@
         ORDER BY USER.register_time desc
     </select>
 
-    <select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+    <select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.user.dto.UserDTO">
         <!--SELECT
         u.id,
         u.REAL_NAME,
@@ -1337,7 +1337,7 @@
     </select>
 
     <!--待认证居民(selectFlag=0) & 已认证党员(selectFlag=1)小程序接口-->
-    <select id="selectAppUserDto" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectAppUserDto" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         user.ID as userId,
         user.NICKNAME as nickname,
@@ -1400,7 +1400,7 @@
     </select>
 
     <!--已认证居民小程序接口-->
-    <select id="selectAppAuthenticatedListUserDtoByList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectAppAuthenticatedListUserDtoByList" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         user.ID as userId,
         user.NICKNAME as nickname,
@@ -1468,7 +1468,7 @@
     </select>
 
     <!--党员认证失败小程序接口-->
-    <select id="selectAppPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectAppPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         select
         ep.REGIST_TIME as registerTime,
         uu.ID as userId,
@@ -1501,7 +1501,7 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
-    <select id="selectUserPoint" resultType="com.elink.esua.epdc.dto.UserActivePointsResultDTO">
+    <select id="selectUserPoint" resultType="com.elink.esua.epdc.user.dto.UserActivePointsResultDTO">
         SELECT
             u.ID userId,
             u.ACTIVE_POINTS activePoints
@@ -1512,7 +1512,7 @@
         AND u.ID = #{userId}
     </select>
 
-    <select id="getUserBaseInfoByUserId" resultType="com.elink.esua.epdc.dto.product.result.EpmetUserBaseInfoDTO">
+    <select id="getUserBaseInfoByUserId" resultType="com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO">
         SELECT
             u.ID,
             u.CUSTOMER_ID,
@@ -1544,7 +1544,7 @@
         where USER_ID = #{userId}
     </update>
 
-    <select id="getUserBaseInfoFromEpdcUser" resultType="com.elink.esua.epdc.dto.product.result.EpmetUserBaseInfoDTO">
+    <select id="getUserBaseInfoFromEpdcUser" resultType="com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO">
         SELECT
             UUID() ID,
             (select dct.dict_value from esua_epdc_admin.sys_dict dct where dct.del_flag = 0 and dct.dict_type = 'dcp' and dct.pid != 0) CUSTOMER_ID,
@@ -1571,7 +1571,7 @@
         and user.ID = #{userId}
     </select>
 
-    <insert id="insertUserBaseInfo" parameterType="com.elink.esua.epdc.dto.product.result.EpmetUserBaseInfoDTO">
+    <insert id="insertUserBaseInfo" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO">
         insert into epmet_user.user_base_info
         (
             ID,
@@ -1620,7 +1620,7 @@
         )
     </insert>
 
-    <update id="updateUserBaseInfo" parameterType="com.elink.esua.epdc.dto.product.result.EpmetUserBaseInfoDTO">
+    <update id="updateUserBaseInfo" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO">
         update epmet_user.user_base_info
             set CUSTOMER_ID = #{customerId},
             USER_ID = #{userId},
@@ -1714,7 +1714,7 @@
         )
     </insert>
 
-    <select id="getUserResiInfoByUserId" resultType="com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO">
+    <select id="getUserResiInfoByUserId" resultType="com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO">
         SELECT
             u.ID,
             u.CUSTOMER_ID,
@@ -1738,7 +1738,7 @@
         AND u.USER_ID = #{userId}
     </select>
 
-    <select id="getUserResiInfoFromEpdcUser" resultType="com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO">
+    <select id="getUserResiInfoFromEpdcUser" resultType="com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO">
         SELECT
             UUID() ID,
             (select dct.dict_value from esua_epdc_admin.sys_dict dct where dct.del_flag = 0 and dct.dict_type = 'dcp' and dct.pid != 0) CUSTOMER_ID,
@@ -1761,7 +1761,7 @@
         where user.DEL_FLAG = '0'
         and user.ID = #{userId}
     </select>
-    <select id="getBrightFlag" resultType="com.elink.esua.epdc.dto.StandardBearerStatusResultDTO">
+    <select id="getBrightFlag" resultType="com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO">
         SELECT
             a.EXAMINE_FLAG as status,
             a.REMARK
@@ -1773,7 +1773,7 @@
             CREATED_TIME DESC
             LIMIT 1
     </select>
-    <select id="queryUserPartyApply" resultType="com.elink.esua.epdc.dto.UserPartyStandardAppltResultDTO">
+    <select id="queryUserPartyApply" resultType="com.elink.esua.epdc.user.dto.epdc.result.UserPartyStandardAppltResultDTO">
         SELECT
             u.id,
             u.REAL_NAME,
@@ -1784,9 +1784,21 @@
             u.id = #{userId}
         AND u.DEL_FLAG = '0'
     </select>
+    <select id="selectFilterUserIdListByTag" resultType="java.lang.String">
+        SELECT
+            r.USER_ID
+        FROM
+            epdc_user_tag_relation r
+            LEFT JOIN epdc_user_tag t ON r.TAG_ID = t.ID AND r.DEL_FLAG = '0'
+        WHERE
+         r.DEL_FLAG = '0'
+        AND t.TAG_CODE = #{userTagValue}
+        AND r.USER_ID IN
+        <foreach collection="userIdList" item="userId" open="(" separator="," close=")">#{userId}</foreach>
+    </select>
 
 
-    <insert id="insertUserResiInfo" parameterType="com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO">
+    <insert id="insertUserResiInfo" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO">
         insert into epmet_user.user_resi_info
         (
             ID,
@@ -1829,7 +1841,7 @@
         )
     </insert>
 
-    <update id="updateUserResiInfo" parameterType="com.elink.esua.epdc.dto.product.result.EpmetUserResiInfoDTO">
+    <update id="updateUserResiInfo" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO">
         update epmet_user.user_resi_info
             set CUSTOMER_ID = #{customerId},
             USER_ID = #{userId},
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridInvitationCodeDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridInvitationCodeDao.xml
index efb44a014..17690e077 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridInvitationCodeDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridInvitationCodeDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserGridInvitationCodeDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserGridInvitationCodeDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.UserGridInvitationCodeEntity" id="userGridInvitationCodeMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.UserGridInvitationCodeEntity" id="userGridInvitationCodeMap">
         <result property="id" column="ID"/>
         <result property="gridId" column="GRID_ID"/>
         <result property="inviteUserId" column="INVITE_USER_ID"/>
@@ -17,7 +17,7 @@
     </resultMap>
 
     <!--  根据网格id、邀请人ID查询邀请码  -->
-    <select id="selectUserGridInvitationCodeDTO" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO" resultType="com.elink.esua.epdc.dto.UserGridInvitationCodeDTO">
+    <select id="selectUserGridInvitationCodeDTO" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO" resultType="com.elink.esua.epdc.user.dto.UserGridInvitationCodeDTO">
         SELECT
             *
         FROM
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml
index 722d56e33..3e49f4bee 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserGridRelationDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserGridRelationDao">
 
-    <select id="selectOneOfGird" resultType="com.elink.esua.epdc.dto.UserGridRelationDTO">
+    <select id="selectOneOfGird" resultType="com.elink.esua.epdc.user.dto.UserGridRelationDTO">
         SELECT
             *
         FROM
@@ -16,7 +16,7 @@
             LIMIT 1
     </select>
 
-    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.UserGridRelationDTO">
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.user.dto.UserGridRelationDTO">
         SELECT
             ID,
             PARENT_DEPT_IDS,
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserInvitationRecordDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserInvitationRecordDao.xml
index bbafa7efe..1cca01ff8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserInvitationRecordDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserInvitationRecordDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserInvitationRecordDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserInvitationRecordDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.UserInvitationRecordEntity" id="userInvitationRecordMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.UserInvitationRecordEntity" id="userInvitationRecordMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="inviteUserId" column="INVITE_USER_ID"/>
@@ -17,7 +17,7 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
     <resultMap id="InvitationUserRecordResultMap"
-               type="com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO">
+               type="com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO">
         <id column="USER_ID" property="userId"/>
         <result column="FACE_IMG" property="nickname"/>
         <result column="NICKNAME" property="userFace"/>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml
index 342b01090..05429e1f4 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserTagDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserTagDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.UserTagEntity" id="userTagMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.UserTagEntity" id="userTagMap">
         <result property="id" column="ID"/>
         <result property="tagName" column="TAG_NAME"/>
         <result property="tagCode" column="TAG_CODE"/>
@@ -25,7 +25,7 @@
     </select>
 
     <!--  根据用户id 查询用户标签信息 -->
-    <select id="selectByUserId" resultType="com.elink.esua.epdc.dto.UserTagInfo">
+    <select id="selectByUserId" resultType="com.elink.esua.epdc.user.dto.UserTagInfo">
     SELECT
         u.id,
         u.TAG_CODE  as tagCode
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml
index 15e11a50b..6b881ad85 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserTagRelationDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserTagRelationDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.UserTagRelationEntity" id="userTagRelationMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.UserTagRelationEntity" id="userTagRelationMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="tagId" column="TAG_ID"/>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserWxFormIdDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserWxFormIdDao.xml
index 894f43904..c7f9f0f66 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserWxFormIdDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserWxFormIdDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.UserWxFormIdDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.UserWxFormIdDao">
 
-    <select id="getByOpenId" resultType="com.elink.esua.epdc.dto.UserWxFormIdDTO">
+    <select id="getByOpenId" resultType="com.elink.esua.epdc.user.dto.UserWxFormIdDTO">
         SELECT
             *
         FROM
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index ab627be18..7f4285666 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.VolunteerInfoDao">
+<mapper namespace="com.elink.esua.epdc.user.dao.VolunteerInfoDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.VolunteerInfoEntity" id="volunteerInfoMap">
+    <resultMap type="com.elink.esua.epdc.user.entity.VolunteerInfoEntity" id="volunteerInfoMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="realName" column="REAL_NAME"/>
@@ -37,7 +37,7 @@
     </resultMap>
 
     <!--根据查询条件，返回首页 志愿者信息列表-->
-    <select id="volunteerInfoList" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
+    <select id="volunteerInfoList" resultType="com.elink.esua.epdc.user.dto.VolunteerInfoDTO">
         SELECT
                 v.ID id,
 				v.USER_ID userId,
@@ -86,7 +86,7 @@
     </select>
 
     <!--根据志愿者id，查询志愿者 单条详情-->
-    <select id="getVolunteerDetail" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
+    <select id="getVolunteerDetail" resultType="com.elink.esua.epdc.user.dto.VolunteerInfoDTO">
         SELECT
         v.ID id,
         v.USER_ID userId,
@@ -106,7 +106,7 @@
         where v.ID = #{id}
     </select>
 
-    <select id="getVolunteerUserDefaultValue" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
+    <select id="getVolunteerUserDefaultValue" resultType="com.elink.esua.epdc.user.dto.VolunteerInfoDTO">
         SELECT
             eu.ID userId,
             eu.REAL_NAME realName,
@@ -129,13 +129,13 @@
             eu.ID = #{id}
     </select>
 
-    <select id="volunteerTagQuery" resultType="com.elink.esua.epdc.dto.UserTagDTO">
+    <select id="volunteerTagQuery" resultType="com.elink.esua.epdc.user.dto.UserTagDTO">
         select t.id,t.tag_name,t.tag_code
         from epdc_user_tag t
         where tag_code = #{tagCode} and del_flag = 0
     </select>
 
-    <update id="updateVolunteerInfo" parameterType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
+    <update id="updateVolunteerInfo" parameterType="com.elink.esua.epdc.user.dto.VolunteerInfoDTO">
         UPDATE epdc_volunteer_info
         SET
         UPDATED_BY = #{updatedBy}
@@ -151,7 +151,7 @@
         SELECT count(*) countNum FROM `epdc_volunteer_info` where del_flag = '0' and USER_ID = #{userId} and AUDIT_STATUS in ('1','0')
     </select>
 
-    <select id="selectAdjustVolunteerPointsDTO" parameterType="java.lang.String" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO">
+    <select id="selectAdjustVolunteerPointsDTO" parameterType="java.lang.String" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcAdjustVolunteerPointsDTO">
         SELECT
             m.id,
             m.USER_ID as userId,
@@ -168,7 +168,7 @@
             AND m.ID = #{id}
     </select>
 
-    <select id="getRankingList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO">
+    <select id="getRankingList" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcGetVolunteerRankDTO">
         select volunteerInfo.* from (
             select (@i:=@i+1) sort, info.*
             from (select
@@ -190,7 +190,7 @@
     </select>
     <!--  根据用户id查询志愿者信息  -->
     <select id="selectOneVolunteerInfoDTO" parameterType="java.lang.String"
-            resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
+            resultType="com.elink.esua.epdc.user.dto.VolunteerInfoDTO">
         select *
      from epdc_volunteer_info m
         where m.DEL_FLAG='0'
@@ -206,7 +206,7 @@
             AND DEL_FLAG = '0'
     </update>
 
-    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.user.dto.VolunteerInfoDTO">
         SELECT
             ID,
             PARENT_DEPT_IDS,
@@ -225,7 +225,7 @@
         where USER_ID = #{userId}
     </update>
 
-    <select id="getVolunteerInfoFromEpdc" resultType="com.elink.esua.epdc.dto.product.result.EpmetVolunteerInfoDTO">
+    <select id="getVolunteerInfoFromEpdc" resultType="com.elink.esua.epdc.user.dto.product.result.EpmetVolunteerInfoDTO">
         SELECT
             v.ID,
             v.USER_ID,
@@ -248,7 +248,7 @@
         where v.USER_ID = #{userId}
     </select>
 
-    <insert id="insertUserRole" parameterType="com.elink.esua.epdc.dto.product.result.EpmetVolunteerInfoDTO">
+    <insert id="insertUserRole" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetVolunteerInfoDTO">
         insert into epmet_heart.volunteer_info
         (
             ID,
diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
index 9ecb8c99b..22130408a 100644
--- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
@@ -18,11 +18,11 @@
             <artifactId>epdc-websocket-client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.esua.epdc.shibei</groupId>
             <artifactId>epdc-user-client</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.esua.epdc.shibei</groupId>