修改包结构

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>

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 0308dc940b9fe23a8b4b20208cec7ac70643312e
+Subproject commit 6d68ee73c50f7aaa1a7d330ef8aef2758a176f8a

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;

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.*;
 

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.*;
 

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.*;
 

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,23 +199,21 @@ 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) {
@@ -223,12 +222,11 @@ public class ApiWorkUserController {
 
 
     /**
-    * @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);

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;

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;

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端接口

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;

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;

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;

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;

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;
 

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;
 

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;
 

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);
     }
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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

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;

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;

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;
 
 /**

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;

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;

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;

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;

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.*;
 

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;
 
 /**

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.*;

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;
 

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;

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;

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;

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

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;

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;
 

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;

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;
 
 /**

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);
     }

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;

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;

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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPageResultDTO.java

@@ -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;
-}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPendingTrialResultDTO.java

@@ -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;
-
-
-}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java → 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

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java → 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;
 
 /**
  * 用户模块字段常量

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java → 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 志愿者审批发送消息常量

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyStandardBearerApplyDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyTagRelationDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PointLogFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserActivePointsResultDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserAuthenticateHistoryDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridInvitationCodeDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserInvitationRecordDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagInfo.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagRelationDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserWxFormIdDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcGridLeaderRegisterDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/UserCarInfoDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/CompleteRequisiteUserInfoDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppPidemicCompleteInfoFromDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcDeleteWxFormIdFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterFormDTO.java → 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;

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcGridLeaderRegisterSubmitFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcLeaderSwitchGridFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcResidentDetailFormDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java → 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;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserGridInvitationCodeFormDTO.java → 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;