diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java
index 831d5a2d0b..638722f904 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java
@@ -8,10 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java
index fbf3950bea..c416f6766d 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java
@@ -8,12 +8,11 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.utils.TreeNode;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java
index 3664870194..7fc9e2191c 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java
@@ -8,10 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java
index 4fd3c654f4..d6b99c9be5 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java
@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java
index 441303c187..89a2dd1be8 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java
@@ -8,11 +8,11 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.utils.TreeNode;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.Min;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java
index 4edefe2792..1b6573d7e0 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java
@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java
index 39f62c48b1..b8b52e8721 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java
@@ -8,9 +8,8 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java
index e55e01bbd3..7279c60b81 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java
@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java
index bba18236ca..fa5db940bc 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java
@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java
index a9cca21013..b08c9fc295 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java
@@ -1,12 +1,7 @@
 package com.epmet.dto.region;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  *
  */
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java
index 3129ba0075..f796b54547 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java
@@ -9,7 +9,6 @@
 package com.epmet.dto.region;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java
index ee4b533bec..88947f2583 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java
@@ -9,9 +9,9 @@
 package com.epmet.remote;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.feign.ParamsFeignClient;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.feign.ParamsFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java
index bba298577f..089ad29639 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java
@@ -3,7 +3,6 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LogOperationListFormDTO;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java
index 3bedc14687..f534eac664 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java
@@ -8,14 +8,14 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysDeptDTO;
-import com.epmet.service.SysDeptService;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysDeptDTO;
+import com.epmet.service.SysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java
index 4d842f5ef1..0f81215fe5 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java
@@ -8,18 +8,18 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysDictTypeDTO;
-import com.epmet.service.SysDictTypeService;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysDictTypeDTO;
 import com.epmet.entity.DictType;
+import com.epmet.service.SysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.Map;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java
index 5d92ad1fba..9400789b8f 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java
@@ -8,16 +8,16 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.MenuResourceDTO;
-import com.epmet.dto.SysMenuDTO;
-import com.epmet.service.SysMenuService;
-import com.epmet.service.SysResourceService;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.MenuResourceDTO;
+import com.epmet.dto.SysMenuDTO;
+import com.epmet.service.SysMenuService;
+import com.epmet.service.SysResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java
index 660402e667..3c0f246e4b 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java
@@ -8,9 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysRegionDTO;
-import com.epmet.dto.region.RegionProvince;
-import com.epmet.service.SysRegionService;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
@@ -19,6 +16,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysRegionDTO;
+import com.epmet.dto.region.RegionProvince;
+import com.epmet.service.SysRegionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java
index 8f9ab0ddf9..916436069a 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java
@@ -8,9 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysRoleDTO;
-import com.epmet.service.SysRoleService;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -18,8 +15,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysRoleDTO;
 import com.epmet.service.SysRoleDataScopeService;
 import com.epmet.service.SysRoleMenuService;
+import com.epmet.service.SysRoleService;
 import com.epmet.service.SysRoleUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java
index d21db797a2..a75447ef1a 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java
@@ -8,16 +8,11 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.security.user.SecurityUser;
-import com.epmet.dto.PasswordDTO;
-import com.epmet.dto.SysUserDTO;
-import com.epmet.service.SysResourceService;
-import com.epmet.service.SysUserService;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.bo.ResourceBO;
 import com.epmet.commons.tools.security.password.PasswordUtils;
+import com.epmet.commons.tools.security.user.SecurityUser;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -27,9 +22,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.PasswordDTO;
+import com.epmet.dto.SysUserDTO;
 import com.epmet.excel.SysUserExcel;
+import com.epmet.service.SysResourceService;
 import com.epmet.service.SysRoleDataScopeService;
 import com.epmet.service.SysRoleUserService;
+import com.epmet.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java
index 0a717f1c50..c9d0e46df3 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 跨域配置表
  *
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java
index d3f3f20402..537d1fc9b2 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java
index 8c07d1279d..93a2f8e5f0 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java
@@ -4,19 +4,12 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
-import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.mq.listener.listener.AuthOperationLogListener;
 import com.epmet.mq.listener.listener.PointOperationLogListener;
 import com.epmet.mq.listener.listener.ProjectOperationLogListener;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 public class RocketMQConsumerRegister extends MQAbstractRegister {
 
@@ -29,4 +22,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
 
         // ...其他监听器类似
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java
index a47d55c2de..d2de3b9bf2 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java
@@ -2,7 +2,6 @@ package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
-import com.epmet.commons.rocketmq.messages.LoginMQMsg;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java
index e07846797a..bc4d1a7932 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.NewsDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.NewsDTO;
 import com.epmet.entity.NewsEntity;
 
 import java.util.Map;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java
index f23af1afef..9655030e62 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java
@@ -8,8 +8,8 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysDeptDTO;
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.SysDeptDTO;
 import com.epmet.entity.SysDeptEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java
index 4f19658c84..fa6fdc7f3c 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysDictTypeDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysDictTypeDTO;
 import com.epmet.entity.DictType;
 import com.epmet.entity.SysDictTypeEntity;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java
index d8a1ae2afc..49cb083951 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysLogErrorDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysLogErrorDTO;
 import com.epmet.entity.SysLogErrorEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java
index 17d3a6958d..058f9e83d0 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysLogLoginDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysLogLoginDTO;
 import com.epmet.entity.SysLogLoginEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java
index e55784fd09..87a830f395 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysLogOperationDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysLogOperationDTO;
 import com.epmet.entity.SysLogOperationEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java
index d160d7700a..3f47eada25 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysMenuDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.user.UserDetail;
+import com.epmet.dto.SysMenuDTO;
 import com.epmet.entity.SysMenuEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java
index 54d5ab2b99..ef51d5d862 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysParamsDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysParamsDTO;
 import com.epmet.entity.SysParamsEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java
index e67940e197..cfe7d84706 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.SysRegionDTO;
 import com.epmet.dto.region.RegionProvince;
-import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.SysRegionEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java
index a212657b51..83893579c8 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.MenuResourceDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.bo.ResourceBO;
+import com.epmet.dto.MenuResourceDTO;
 import com.epmet.entity.SysResourceEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java
index 9a740f42d6..a2d5e05982 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysRoleDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysRoleDTO;
 import com.epmet.entity.SysRoleEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java
index 2681b6d027..397a06903e 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java
@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysUserDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysUserDTO;
 import com.epmet.entity.SysUserEntity;
 
 import java.util.List;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java
index 2441882ea3..0554dc3b84 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java
@@ -13,7 +13,6 @@ import com.epmet.service.CorsConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
index 4ccc4e868f..1cbf7e32d2 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.epmet.auth.constants.AuthOperationEnum;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.feign.ResultDataResolver;
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java
index 220cf7d171..211ddeb5ec 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java
@@ -9,7 +9,6 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.epmet.commons.mybatis.annotation.DataFilter;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
diff --git a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java
index d4edbb0b56..07efb95921 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java
@@ -3,7 +3,6 @@ package com.epmet.controller;
 import com.epmet.redis.CustomerAppWxServiceUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Set;
 
diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
index 8745418f90..386e162c02 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java
index 89fb9b183c..43b2719dc8 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java
@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-
 
 /**
  * @author sun
diff --git a/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java b/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java
index 659945bddb..27f9cde583 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java
@@ -29,7 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 @RestController
 @RequestMapping("ic")
diff --git a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java
index 8f93ab52fb..2e8ecb456e 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java
@@ -1,7 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -13,11 +12,7 @@ import com.epmet.dto.form.PublicSendSmsCodeFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.PublicUserLoginService;
-import com.netflix.ribbon.proxy.annotation.Http;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.*;
 
 /**
diff --git a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
index 59fd01d2c9..8dc85dacba 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.SsoEnteOrgFormDTO;
 import com.epmet.dto.form.SsoLoginFormDTO;
-import com.epmet.dto.form.SsoWorkLoginFormDTO;
 import com.epmet.dto.form.SsoLoginOperFormDTO;
+import com.epmet.dto.form.SsoWorkLoginFormDTO;
 import com.epmet.dto.result.SsoLoginResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.SsoService;
diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
index 65e718aacf..144e18d024 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
@@ -1,10 +1,7 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
diff --git a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java
index 33baf31c52..05e5830e99 100644
--- a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java
+++ b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java
@@ -11,14 +11,12 @@ package com.epmet.jwt;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.apache.commons.codec.binary.Base64;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
index 8d78665550..cbc46e33f1 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
@@ -5,7 +5,6 @@ import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
index d6edfb8657..eab142e6a5 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
@@ -14,8 +14,6 @@ import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.form.GovWebLoginFormDTO;
 import com.epmet.dto.form.GovWebOperLoginFormDTO;
 import com.epmet.dto.result.GovWebOperLoginResultDTO;
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java
index 1e1767070e..ea0ae6d5fb 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java
@@ -29,7 +29,9 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 @Slf4j
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
index 698118c5ce..d6e88bb66e 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
@@ -16,7 +16,10 @@ import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.PaUserDTO;
 import com.epmet.dto.PaUserWechatDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.RegisterResultDTO;
+import com.epmet.dto.result.SaveUserResultDTO;
+import com.epmet.dto.result.SendVerificationCodeResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java
index 936d7dd2bb..27218b1bd7 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java
@@ -8,7 +8,6 @@
 
 package com.epmet.service.impl;
 
-import io.jsonwebtoken.Claims;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.enums.SuperAdminEnum;
 import com.epmet.commons.tools.exception.ErrorCode;
@@ -23,6 +22,7 @@ import com.epmet.feign.ResourceFeignClient;
 import com.epmet.feign.UserFeignClient;
 import com.epmet.jwt.JwtUtils;
 import com.epmet.service.ResourceService;
+import io.jsonwebtoken.Claims;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-auth/src/test/java/com/epmet/TokenGenTest.java b/epmet-auth/src/test/java/com/epmet/TokenGenTest.java
index 578e7a6652..9783e5a013 100644
--- a/epmet-auth/src/test/java/com/epmet/TokenGenTest.java
+++ b/epmet-auth/src/test/java/com/epmet/TokenGenTest.java
@@ -1,12 +1,9 @@
 package com.epmet;
 
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.service.impl.GovLoginServiceImpl;
diff --git a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm
index 435224d75b..2b277f4442 100644
--- a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm
+++ b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm
@@ -17,8 +17,9 @@
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
-export default {
+    import debounce from 'lodash/debounce'
+
+    export default {
   data () {
     return {
       visible: false,
diff --git a/epmet-cloud-generator/src/main/resources/template/index.vue.vm b/epmet-cloud-generator/src/main/resources/template/index.vue.vm
index f2cb7597fd..aa5bcb3494 100644
--- a/epmet-cloud-generator/src/main/resources/template/index.vue.vm
+++ b/epmet-cloud-generator/src/main/resources/template/index.vue.vm
@@ -43,9 +43,10 @@
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './${pathName}-add-or-update'
-export default {
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
   mixins: [mixinViewModule],
   data () {
     return {
diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
index 8042695c85..c34ba58d0c 100644
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
@@ -1,7 +1,6 @@
 package com.epmet.common.token.util;
 
 import com.epmet.common.token.property.TokenPropertise;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/util/AbstractDataSourceNameFetcher.java b/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/util/AbstractDataSourceNameFetcher.java
index 5069bd5958..736e1d4275 100644
--- a/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/util/AbstractDataSourceNameFetcher.java
+++ b/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/util/AbstractDataSourceNameFetcher.java
@@ -1,7 +1,5 @@
 package com.epmet.commons.dynamic.datasource.util;
 
-import com.epmet.commons.dynamic.datasource.enums.DataSourceEnum;
-
 public abstract class AbstractDataSourceNameFetcher {
 
     public abstract String fetchDataSourceName();
diff --git a/epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java b/epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java
index 060b882cf5..7a89892639 100644
--- a/epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java
+++ b/epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java
@@ -2,9 +2,9 @@ package com.epmet.commons.extappauth.aspect;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.extappauth.jwt.JwtTokenUtils;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
index 0772305976..34b324ee6d 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java
@@ -1,8 +1,8 @@
 package com.epmet.commons.mybatis.aspect;
 
 import com.epmet.commons.mybatis.annotation.DataFilter;
+import com.epmet.commons.mybatis.dto.form.GetSQLFilterFormDTO;
 import com.epmet.commons.mybatis.feign.MybatisGovAccessFeignClient;
-import com.epmet.commons.mybatis.dto.form.*;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import com.epmet.commons.tools.exception.RenException;
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/StaffPermissionFormDTO.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/StaffPermissionFormDTO.java
index 3bc88d6fb1..6bbd0f6424 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/StaffPermissionFormDTO.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/StaffPermissionFormDTO.java
@@ -2,9 +2,6 @@ package com.epmet.commons.mybatis.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import java.util.Set;
-
 @Data
 public class StaffPermissionFormDTO {
 
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java
index 2b712ff301..efb82a3e00 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java
@@ -1,17 +1,13 @@
 package com.epmet.commons.mybatis.feign;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.GetSQLFilterFormDTO;
 import com.epmet.commons.mybatis.feign.fallback.MybatisGovAccessFeignClientFallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * @Description
  * @Author sun
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovOrgFeignClient.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovOrgFeignClient.java
index c912ab332c..21dc330ef9 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovOrgFeignClient.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovOrgFeignClient.java
@@ -1,6 +1,6 @@
 package com.epmet.commons.mybatis.feign;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.DepartmentListResultDTO;
 import com.epmet.commons.mybatis.feign.fallback.MybatisGovOrgFeignClientFallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Description
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java
index 97f64e9d95..80559aba86 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java
@@ -1,16 +1,11 @@
 package com.epmet.commons.mybatis.feign.fallback;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.GetSQLFilterFormDTO;
 import com.epmet.commons.mybatis.feign.MybatisGovAccessFeignClient;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 调用政府端权限
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovOrgFeignClientFallback.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovOrgFeignClientFallback.java
index dbe95f21eb..f996fbb110 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovOrgFeignClientFallback.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovOrgFeignClientFallback.java
@@ -1,6 +1,6 @@
 package com.epmet.commons.mybatis.feign.fallback;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.DepartmentListResultDTO;
 import com.epmet.commons.mybatis.feign.MybatisGovOrgFeignClient;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
@@ -8,7 +8,6 @@ import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 调用政府端权限
diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java
index 9e535212f9..527614651c 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java
@@ -10,7 +10,6 @@ package com.epmet.commons.mybatis.interceptor;
 
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler;
-import com.epmet.commons.mybatis.aspect.DataFilterAspect;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.executor.statement.StatementHandler;
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java
index 650b9e9f90..14a5a24ff8 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java
@@ -1,11 +1,8 @@
 package com.epmet.commons.rocketmq.messages;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 组织、网格、人员中间库数据上报MQ
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQAbstractRegister.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQAbstractRegister.java
index b1ca887c59..fbf2a0e40c 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQAbstractRegister.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQAbstractRegister.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListener;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 
 /**
diff --git a/epmet-commons/epmet-commons-security/src/main/java/com/epmet/commons/security/jwt/JwtUtils.java b/epmet-commons/epmet-commons-security/src/main/java/com/epmet/commons/security/jwt/JwtUtils.java
index 8df0b6cd8f..353df788cc 100644
--- a/epmet-commons/epmet-commons-security/src/main/java/com/epmet/commons/security/jwt/JwtUtils.java
+++ b/epmet-commons/epmet-commons-security/src/main/java/com/epmet/commons/security/jwt/JwtUtils.java
@@ -14,7 +14,6 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java
index 67f3cc3296..ab00af532f 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java
@@ -2,7 +2,6 @@ package com.epmet.commons.thirdplat;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.thirdplat.dto.form.jcet.SsoTicketFormDTO;
-import com.epmet.commons.thirdplat.dto.form.jcet.SsoTokenFormDTO;
 import com.epmet.commons.thirdplat.encrypt.SignUtils;
 
 import java.io.UnsupportedEncodingException;
diff --git a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java
index 0f22dd27ff..232082f696 100644
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java
@@ -1,14 +1,13 @@
 package com.epmet.wx.mp.handler;
 
-import java.util.Map;
-
-import org.springframework.stereotype.Component;
-
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
 
 /**
  * @author Binary Wang(https://github.com/binarywang)
diff --git a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java
index 4acfb20c81..017fb0334b 100644
--- a/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java
+++ b/epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java
@@ -1,16 +1,15 @@
 package com.epmet.wx.mp.handler;
 
-import java.util.Map;
-
 import com.epmet.wx.mp.builder.TextBuilder;
-import org.springframework.stereotype.Component;
-
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
 
 /**
  * @author Binary Wang(https://github.com/binarywang)
diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml
index 867fcf47c7..b0f7737940 100644
--- a/epmet-commons/epmet-commons-tools/pom.xml
+++ b/epmet-commons/epmet-commons-tools/pom.xml
@@ -24,7 +24,7 @@
         <gson.version>2.8.6</gson.version>
         <jsoup.version>1.11.3</jsoup.version>
         <lombok.version>1.18.4</lombok.version>
-        <easyexcel.version>3.0.3</easyexcel.version>
+        <easyexcel.version>3.0.5</easyexcel.version>
     </properties>
 
     <dependencies>
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java
index 1cbbd2a887..bb889a5913 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java
@@ -1,10 +1,6 @@
 package com.epmet.commons.tools.annotation;
 
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
-import javassist.runtime.Inner;
-
 import java.lang.annotation.*;
-import java.util.function.Function;
 
 /**
  * 标记一个接口，它的返回值中的某些字段需要打掩码
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java
index ab8efec85e..cd9c3689e7 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java
@@ -1,7 +1,6 @@
 package com.epmet.commons.tools.config;
 
 import com.alibaba.ttl.TtlRunnable;
-import com.alibaba.ttl.threadpool.TtlExecutors;
 import org.slf4j.MDC;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -10,7 +9,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * 线程池配置类
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ThreadLocalConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ThreadLocalConstant.java
index 40d69ebcf4..64c186cc11 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ThreadLocalConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ThreadLocalConstant.java
@@ -1,7 +1,5 @@
 package com.epmet.commons.tools.constant;
 
-import java.util.Map;
-
 /**
  * ThreadLocal常亮
  */
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java
index 5604377ed5..de004b3481 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java
@@ -2,6 +2,8 @@ package com.epmet.commons.tools.enums;
 
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 
+import java.util.Objects;
+
 public enum GenderEnum {
     MAN("1", "男"),
     WOMAN("2", "女"),
@@ -19,7 +21,7 @@ public enum GenderEnum {
     public static String getName(String code) {
         GenderEnum[] genderEnums = values();
         for (GenderEnum genderEnum : genderEnums) {
-            if (genderEnum.getCode() == code) {
+            if (Objects.equals(genderEnum.getCode(), code)) {
                 return genderEnum.getName();
             }
         }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 3b1ed3c0c4..8140096f7d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -254,6 +254,7 @@ public enum EpmetErrorCode {
 	IC_NAT_IDCARD_NATTIME(8923,"已存在相同记录"),
 	IC_NAT(8924,"平台已存在记录，请去修改原有记录"),
 	RESI_IC_NAT(8925,"已存在记录，请联系社区工作人员修改"),
+	IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"),
 
 
 	//通用错误码 start
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
index 2cfa8ea3ad..f7eb3a778d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
@@ -25,7 +25,7 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor {
 
 //        Map<String, String> requestHeaders = getHeadersFromRequest();
 
-        log.info("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders);
+        log.debug("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders);
 
         if (requestHeaders != null && requestHeaders.size() > 0) {
             for (Map.Entry<String, String> kv : requestHeaders.entrySet()) {
@@ -59,4 +59,4 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor {
 
         return headers;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
index 353fb06a47..eb1632d1e6 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
@@ -13,8 +13,10 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
+/**
+ * desc:脱敏处理器
+ */
 @Slf4j
 public class MaskProcessor {
 
@@ -42,20 +44,15 @@ public class MaskProcessor {
 
         if (object instanceof Result) {
             mask(((Result<?>) object).getData());
-            return;
         } else if (object instanceof PageData) {
             mask(((PageData<?>) object).getList());
-            return;
         } else if (object instanceof List) {
             ((List)object).forEach(e -> mask(e));
-            return;
         } else if (object instanceof Map) {
             maskMap((Map) object);
-            return;
         } else if (object.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) {
             // 自定义bean，走反射
             maskEpmetBean(object);
-            return;
         }
     }
 
@@ -77,14 +74,12 @@ public class MaskProcessor {
             if (value != null && value.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) {
                 // 是epmet的对象
                 maskEpmetBean(value);
-                continue;
             } else if (value instanceof String) {
                 int index = fieldNames.indexOf(key);
                 if (index != -1) {
                     String maskResult = maskString((String) value, fieldsMaskType.get(index));
                     entry.setValue(maskResult);
                 }
-                continue;
             }
         }
     }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
index d1af449333..1d201149f4 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java
@@ -9,12 +9,12 @@
 package com.epmet.commons.tools.security.config;
 
 import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver;
+import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver;
-import com.epmet.commons.tools.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
index b664acab2a..18991ebc6b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCrypt.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCrypt.java
index 945f3214c1..383ed467fb 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCrypt.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCrypt.java
@@ -1,8 +1,6 @@
 package com.epmet.commons.tools.security.password;
 
 import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java
index cdfc906740..ab73429b69 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java
@@ -27,17 +27,12 @@ import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
-import org.springframework.web.servlet.HandlerMapping;
 
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 
 /**
  * 有@LoginUser注解的方法参数，注入当前登录用户
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java
index 4f14885e9d..f0dad5d9ab 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java
@@ -1,7 +1,6 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
-import com.epmet.commons.tools.constant.StrConstant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
index bd5c5597c0..3d6324f4fa 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
@@ -64,6 +64,36 @@ public class ExcelUtils {
         out.close();
     }
 
+    /**
+     * Excel导出
+     *
+     * @param response      response
+     * @param fileName      文件名
+     * @param list          数据List
+     * @param pojoClass     对象Class
+     */
+    public static void exportExcelEpmet(HttpServletResponse response, String fileName, Collection<?> list,
+                                   Class<?> pojoClass) throws IOException {
+        if(StringUtils.isBlank(fileName)){
+            //当前日期
+            fileName = DateUtils.format(new Date());
+        }
+
+        ExportParams exportParams = new ExportParams();
+        //设置导出的样式
+        exportParams.setStyle(EasyPoiExcelExportStylerImpl.class);
+        //设置sheet名称
+        exportParams.setSheetName("Sheet1");
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
+        Sheet sheet1 = workbook.getSheetAt(0);
+        sheet1.setDefaultColumnWidth(50*256);
+        //sheet1.setDefaultRowHeight((short)(2*256));
+        ServletOutputStream out = ExcelUtils.getOutputStreamForExcelEpmet(fileName,response);
+        workbook.write(out);
+        out.flush();
+        out.close();
+    }
+
     /**
      * Excel导出，先sourceList转换成List<targetClass>，再导出
      *
@@ -84,6 +114,26 @@ public class ExcelUtils {
         exportExcel(response, fileName, targetList, targetClass);
     }
 
+    /**
+     * Excel导出，先sourceList转换成List<targetClass>，再导出
+     *
+     * @param response      response
+     * @param fileName      文件名
+     * @param sourceList    原数据List
+     * @param targetClass   目标对象Class
+     */
+    public static void exportEpmetExcel(HttpServletResponse response, String fileName, Collection<?> sourceList,
+                                           Class<?> targetClass) throws Exception {
+        List<Object> targetList = new ArrayList<>(sourceList.size());
+        for(Object source : sourceList){
+            Object target = targetClass.newInstance();
+            BeanUtils.copyProperties(source, target);
+            targetList.add(target);
+        }
+
+        exportExcelEpmet(response, fileName, targetList, targetClass);
+    }
+
     public static ServletOutputStream getOutputStreamForExcel(String fileName, HttpServletResponse response) throws IOException {
         fileName = URLEncoder.encode(fileName, "UTF-8");
         if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){
@@ -97,6 +147,19 @@ public class ExcelUtils {
         return response.getOutputStream();
     }
 
+    public static ServletOutputStream getOutputStreamForExcelEpmet(String fileName, HttpServletResponse response) throws IOException {
+        fileName = URLEncoder.encode(fileName, "UTF-8");
+        if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){
+            fileName = fileName + ".xls";
+        }
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-Disposition", "attachment;filename=" +  fileName);
+        response.addHeader("Access-Control-Expose-Headers", "Content-disposition");
+
+        return response.getOutputStream();
+    }
+
     /**
      * desc:easypoi导出多个sheet
      * @param fileName
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java
index 32a017b1e2..430929ad97 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java
@@ -2,13 +2,10 @@ package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.exception.RenException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.CharEncoding;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java
index 6d87e3bd2c..53713e032c 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java
@@ -8,7 +8,6 @@
 
 package com.epmet.commons.tools.utils;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java
index 54f395bbc9..e8408478ea 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java
@@ -28,6 +28,10 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler {
      * 从下标n行开始合并
      */
     private int mergeRowIndex;
+    /**
+     * 默认隐藏第一列 用于合并数据
+     */
+    private boolean hiddenFirst = true;
 
     public ExcelFillCellMergeStrategy() {
     }
@@ -36,6 +40,11 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler {
         this.mergeRowIndex = mergeRowIndex;
         this.mergeColumnIndexArr = mergeColumnIndexArr;
     }
+    public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndexArr,boolean hiddenFirst) {
+        this.mergeRowIndex = mergeRowIndex;
+        this.mergeColumnIndexArr = mergeColumnIndexArr;
+        this.hiddenFirst = hiddenFirst;
+    }
 
     @Override
     public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {
@@ -45,7 +54,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler {
     @Override
     public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
         // 隐藏id列
-        writeSheetHolder.getSheet().setColumnHidden(0, true);
+        if (hiddenFirst ){
+            writeSheetHolder.getSheet().setColumnHidden(0, true);
+        }
     }
 
     @Override
@@ -91,9 +102,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler {
             // 将当前单元格数据与上一个单元格数据比较
             Boolean dataBool = preData.equals(curData);
             //此处需要注意：因为我是按照序号确定是否需要合并的，所以获取每一行第一列数据和上一行第一列数据进行比较，如果相等合并
-            Boolean bool = cell.getRow().getCell(0).getStringCellValue().equals(cell.getSheet().getRow(curRowIndex - 1).getCell(0).getStringCellValue());
 
-            if (!dataBool || !bool) {
+
+            if (!dataBool) {
                 return;
             }
                 Sheet sheet = writeSheetHolder.getSheet();
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
index 13e0239d96..0b0c3cbc8b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
@@ -4,15 +4,17 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Hashtable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static java.util.regex.Pattern.*;
+import static java.util.regex.Pattern.compile;
 
 /**
  * 身份证号校验
@@ -24,6 +26,15 @@ public class IdCardNoValidatorUtils {
 
     private static Logger logger = LoggerFactory.getLogger(IdCardNoValidatorUtils.class);
 
+    /**
+     * 15位身份证号
+     */
+    private static final Integer FIFTEEN_ID_CARD = 15;
+    /**
+     * 18位身份证号
+     */
+    private static final Integer EIGHTEEN_ID_CARD = 18;
+
     /**
      * 身份证验证
      *
@@ -216,15 +227,15 @@ public class IdCardNoValidatorUtils {
         int nowMonth = now.getMonthValue();
         int cardYear = 0;
         int cardMonth = 0;
-        if (StringUtils.isNotBlank(IDCard) && checkIsIdCardNo(IDCard)) {
-            if (IDCard.length() == 15) {
+        if (StringUtils.isNotBlank(IDCard) && isValid(IDCard)) {
+            if (IDCard.length() == FIFTEEN_ID_CARD) {
                 // 身份证上的年份(15位身份证为1980年前的)
                 String uyear = "19" + IDCard.substring(6, 8);
                 cardYear = Integer.parseInt(uyear);
                 // 身份证上的月份
                 String uyue = IDCard.substring(8, 10);
                 cardMonth = Integer.parseInt(uyue);
-            } else if (IDCard.length() == 18) {
+            } else if (IDCard.length() == EIGHTEEN_ID_CARD) {
                 // 身份证上的年份
                 String year = IDCard.substring(6).substring(0, 4);
                 cardYear = Integer.parseInt(year);
@@ -243,5 +254,47 @@ public class IdCardNoValidatorUtils {
         return age;
     }
 
+    /**
+     * 身份证验证是否有效
+     *
+     * @param id 号码内容
+     * @return boolean
+     * @author
+     * @date
+     */
+    public static boolean isValid(String id) {
+        Boolean validResult = true;
+        //校验长度只能为15或18
+        int len = id.length();
+        if (len != FIFTEEN_ID_CARD && len != EIGHTEEN_ID_CARD) {
+            validResult = false;
+        }
+        //校验生日
+        if (!validDate(id)) {
+            validResult = false;
+        }
+        return validResult;
+    }
+
+    /**
+     * 校验生日
+     *
+     * @param id
+     * @return
+     */
+    private static boolean validDate(String id) {
+        try {
+            String birth = id.length() == FIFTEEN_ID_CARD ? "19" + id.substring(6, 12) : id.substring(6, 14);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            Date birthDate = sdf.parse(birth);
+            if (!birth.equals(sdf.format(birthDate))) {
+                return false;
+            }
+        } catch (ParseException e) {
+            return false;
+        }
+        return true;
+    }
+
 }
 
diff --git a/epmet-gateway/src/main/java/com/epmet/auth/AuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/AuthProcessor.java
index e5a2027e56..21cb2a375a 100644
--- a/epmet-gateway/src/main/java/com/epmet/auth/AuthProcessor.java
+++ b/epmet-gateway/src/main/java/com/epmet/auth/AuthProcessor.java
@@ -1,15 +1,7 @@
 package com.epmet.auth;
 
-import com.alibaba.fastjson.JSON;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.nio.charset.StandardCharsets;
 
 public abstract class AuthProcessor {
 
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java
index d6d2396a15..da53f1c6c1 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java
@@ -9,18 +9,16 @@
 package com.epmet.filter;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.feign.ResourceFeignClient;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResourceFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index 4ed4a4cf66..7ed4ce8321 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -9,7 +9,8 @@ import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * app接口权限过滤器
diff --git a/epmet-gateway/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-gateway/src/main/java/com/epmet/healthcheck/HealthCheckController.java
index 881cc37548..37f4ab6f71 100644
--- a/epmet-gateway/src/main/java/com/epmet/healthcheck/HealthCheckController.java
+++ b/epmet-gateway/src/main/java/com/epmet/healthcheck/HealthCheckController.java
@@ -1,7 +1,6 @@
 package com.epmet.healthcheck;
 
 import com.epmet.commons.tools.utils.Result;
-import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java b/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java
index 227f4666fd..2594097f10 100644
--- a/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java
+++ b/epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java
@@ -11,14 +11,12 @@ package com.epmet.jwt;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.apache.commons.codec.binary.Base64;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
index 9f8c5fd1b1..f600a533bc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.dto.datastats.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
index 3db0c9939d..fe7498a1aa 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -17,7 +18,7 @@ public class AcUserAuthorizeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -82,4 +83,4 @@ public class AcUserAuthorizeDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
index a1bb83f55b..5a4baf0d34 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class AcUserDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -118,4 +119,4 @@ public class AcUserDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
index 8c0956058f..d10f99fcdf 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -82,4 +83,4 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
      * 更新时间
      */
     private Date updatedTime;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
index 1b995189c6..b34f8f2fbf 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectTemplateDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -108,4 +109,4 @@ public class PrProjectTemplateDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
index 2174d4f39d..16fe6b340d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectTemplateItemDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,7 +55,7 @@ public class PrProjectTemplateItemDTO implements Serializable {
 	private String formItemId;
 
     /**
-     * 表单项类型 
+     * 表单项类型
      */
 	private String type;
 
@@ -99,7 +100,7 @@ public class PrProjectTemplateItemDTO implements Serializable {
 	private String expand;
 
     /**
-     * 正则表达式 
+     * 正则表达式
      */
 	private String regList;
 
@@ -138,4 +139,4 @@ public class PrProjectTemplateItemDTO implements Serializable {
      */
 	private Integer isDisplayType;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
index 8bf8538c2a..224143068a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectThemeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -98,4 +99,4 @@ public class PrProjectThemeDTO implements Serializable {
      * 更新时间
      */
     private Date updatedTime;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
index 944965d1ec..e7919191d6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrPublishRangeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -93,4 +94,4 @@ public class PrPublishRangeDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
index 4f0ade42a5..8443092878 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrResultExtDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -98,4 +99,4 @@ public class PrResultExtDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
index 7f9bba34cb..60013cbe29 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -118,4 +119,4 @@ public class PrUserProjectDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
index 614236b09c..1164ed5eb5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectItemDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,7 +55,7 @@ public class PrUserProjectItemDTO implements Serializable {
 	private String formItemId;
 
     /**
-     * 表单项类型 
+     * 表单项类型
      */
 	private String type;
 
@@ -104,7 +105,7 @@ public class PrUserProjectItemDTO implements Serializable {
 	private String expand;
 
     /**
-     * 正则表达式 
+     * 正则表达式
      */
 	private String regList;
 
@@ -138,4 +139,4 @@ public class PrUserProjectItemDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
index 901a8b41ba..ef9620d0ab 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -54,7 +55,7 @@ public class PrUserProjectLogicDTO implements Serializable {
 	private String formItemId;
 
     /**
-     * 条件选项 
+     * 条件选项
      */
 	private Integer expression;
 
@@ -93,4 +94,4 @@ public class PrUserProjectLogicDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
index dd81d962fc..b6178c2185 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectResultDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -138,4 +139,4 @@ public class PrUserProjectResultDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
index bb44c7e351..e8dfd8123d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectSettingDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -74,7 +75,7 @@ public class PrUserProjectSettingDTO implements Serializable {
 	private Integer isWxWrite;
 
     /**
-     * 
+     *
      */
 	private Integer isWxWriteOnce;
 
@@ -183,4 +184,4 @@ public class PrUserProjectSettingDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
index e42dd917fc..f1934599e5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectThemeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -123,4 +124,4 @@ public class PrUserProjectThemeDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
index 7e747c2680..87617d0d37 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrVistRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -88,4 +89,4 @@ public class PrVistRecordDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
index e50b5fffab..3072a56725 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 微信公众号用户 
+ * 微信公众号用户
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
@@ -59,12 +60,12 @@ public class WxMpUserDTO implements Serializable {
 	private String headImgUrl;
 
     /**
-     * 
+     *
      */
 	private String unionId;
 
     /**
-     * 
+     *
      */
 	private String openId;
 
@@ -123,4 +124,4 @@ public class WxMpUserDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java
index 2e0a1a953f..399de9b5a6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckHeaderInfoFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.epmettduck.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeCertificationConfigFieldDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeCertificationConfigFieldDTO.java
index 7252e445b0..28c1481fe2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeCertificationConfigFieldDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeCertificationConfigFieldDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -35,7 +36,7 @@ public class BadgeCertificationConfigFieldDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -99,4 +100,4 @@ public class BadgeCertificationConfigFieldDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeDTO.java
index d1fc1d1a43..6f380418d5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/BadgeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class BadgeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java
index c4b24217e3..dec7a89cc7 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -133,4 +134,4 @@ public class CustomerStaffDTO implements Serializable {
      */
 	private String password;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerUserDTO.java
index 66f1c257b3..8b7517be6d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerUserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerUserDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class CustomerUserDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleDTO.java
index b6d866eda6..4cb2dec82b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -59,32 +60,32 @@ public class GovStaffRoleDTO implements Serializable {
 	private String orgType;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
@@ -103,4 +104,4 @@ public class GovStaffRoleDTO implements Serializable {
      */
 	private Integer sort;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleTemplateDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleTemplateDTO.java
index 731a3de81d..ce9b19ac87 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleTemplateDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleTemplateDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -69,33 +70,33 @@ public class GovStaffRoleTemplateDTO implements Serializable {
     private String sort;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridLatestDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridLatestDTO.java
index c0ddfade87..54f038a217 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridLatestDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridLatestDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 最近访问网格表 
+ * 最近访问网格表
 记录用户访问网格的最近一次记录，对同一网格只记录一条记录，同一网格每次只更新最近一次访问的时间
  *
  * @author generator generator@elink-cn.com
@@ -99,4 +100,4 @@ public class GridLatestDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridVisitedDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridVisitedDTO.java
index c7fa297cd9..3feb936fe0 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridVisitedDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GridVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class GridVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/OperUserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/OperUserDTO.java
index f3eb7ebc02..b5fbe0e960 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/OperUserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/OperUserDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class OperUserDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java
index 245636ced7..2759e4f745 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class RegisterRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/ResiUserBadgeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/ResiUserBadgeDTO.java
index e6290b9637..97586c844a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/ResiUserBadgeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/ResiUserBadgeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ResiUserBadgeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RoleDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RoleDTO.java
index 03ca62bcad..5a6a04dc3f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RoleDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RoleDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
@@ -83,4 +84,4 @@ public class RoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffAgencyVisitedDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffAgencyVisitedDTO.java
index e0dd85fb43..c2b2f0100a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffAgencyVisitedDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffAgencyVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class StaffAgencyVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffGridVisitedDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffGridVisitedDTO.java
index e8f6761945..4db10c515c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffGridVisitedDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffGridVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class StaffGridVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java
index e9db8368de..7e37ad1e15 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java
index fee3786630..23772b525a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class StaffRoleDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,32 +55,32 @@ public class StaffRoleDTO implements Serializable {
 	private String orgId;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
@@ -88,4 +89,4 @@ public class StaffRoleDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java
index b5afb3476d..d627cc591c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 工作人员微信关系表 
+ * 工作人员微信关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
@@ -128,4 +129,4 @@ public class StaffWechatDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceDTO.java
index a1f9449b90..9fe343ed58 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -54,12 +55,12 @@ public class UserAdviceDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String agencyPids;
 
     /**
-     * 
+     *
      */
 	private String agencyAllParentName;
 
@@ -168,4 +169,4 @@ public class UserAdviceDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceImgDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceImgDTO.java
index e3073e113f..e91fe1521c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceImgDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserAdviceImgDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class UserAdviceImgDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBadgeCertificateRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBadgeCertificateRecordDTO.java
index 5969d6d34b..55d099b530 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBadgeCertificateRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBadgeCertificateRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -39,7 +40,7 @@ public class UserBadgeCertificateRecordDTO implements Serializable {
 	private String id;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
@@ -143,4 +144,4 @@ public class UserBadgeCertificateRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBaseInfoDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBaseInfoDTO.java
index f78f064bd5..29752b88a2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBaseInfoDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserBaseInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -133,4 +134,4 @@ public class UserBaseInfoDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserCustomerDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserCustomerDTO.java
index 9922266f3a..fae321dfbc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserCustomerDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserCustomerDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 用户客户关系表 
+ * 用户客户关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
@@ -83,4 +84,4 @@ public class UserCustomerDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java
index f8596020d1..51657f7059 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 用户表 
+ * 用户表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
@@ -83,4 +84,4 @@ public class UserDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserInvitationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserInvitationDTO.java
index 5a048747b7..611ae48264 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserInvitationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserInvitationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class UserInvitationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiInfoDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiInfoDTO.java
index 9051ef7ef9..29ca462e0e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiInfoDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class UserResiInfoDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiRegisterVisitDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiRegisterVisitDTO.java
index 43e72c1ada..fe4c347c55 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiRegisterVisitDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserResiRegisterVisitDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class UserResiRegisterVisitDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserRoleDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserRoleDTO.java
index 3e369e1099..ac0269f159 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserRoleDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserRoleDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 用户角色关系表 
+ * 用户角色关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
@@ -88,4 +89,4 @@ public class UserRoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java
index 6731f94132..a7e0f3bada 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 用户微信端关系表 
+ * 用户微信端关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
@@ -128,4 +129,4 @@ public class UserWechatDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/GridMemberPatrolListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/GridMemberPatrolListFormDTO.java
index a7ffd9dc56..30a742c66a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/GridMemberPatrolListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/GridMemberPatrolListFormDTO.java
@@ -3,11 +3,8 @@ package com.epmet.dataaggre.dto.epmetuser.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 对外接口--网格员排名-巡查记录-接口入参
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleListFormDTO.java
index 28e192112b..6f850b1b6e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleListFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dataaggre.dto.epmetuser.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java
index ea545fb8a3..c2e589d7a2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java
@@ -7,7 +7,6 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcUserCategoryResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcUserCategoryResultDTO.java
index 08d4d30b7b..8740c9cfc4 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcUserCategoryResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcUserCategoryResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.dto.epmetuser.result;
 
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java
index fc11fafe4f..c0300e2522 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dataaggre.dto.govissue;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -90,4 +89,4 @@ public class IssueProjectCategoryDictDTO implements Serializable {
     private String color;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/form/ShiftProjectIssueListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/form/ShiftProjectIssueListFormDTO.java
index 34f3d13326..8d59f432cc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/form/ShiftProjectIssueListFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/form/ShiftProjectIssueListFormDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 议题-已转项目列表-接口入参
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridLivelyFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridLivelyFormDTO.java
index 326baba505..6c1f23785b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridLivelyFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridLivelyFormDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 网格活跃度-接口入参
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
index a03d93fb71..4a63e5c8ee 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dataaggre.dto.govorg.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridLivelyResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridLivelyResultDTO.java
index 71bd1947f8..207b0de4a9 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridLivelyResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridLivelyResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.govorg.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 网格活跃度-接口返参
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessAttachmentDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessAttachmentDTO.java
index 5e8a24fec4..ebc9dca837 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessAttachmentDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -104,7 +105,7 @@ public class ProjectProcessAttachmentDTO implements Serializable {
 	private Integer isRelease;
 
     /**
-     * 附件审核状态（审核中：auditing； 
+     * 附件审核状态（审核中：auditing；
 auto_passed: 自动通过；
 review：结果不确定，需要人工审核；
 block: 结果违规；
@@ -149,4 +150,4 @@ approved：人工审核通过）
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessScanTaskDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessScanTaskDTO.java
index 4200614e72..234847e732 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessScanTaskDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessScanTaskDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -101,4 +102,4 @@ block: 结果违规；】
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java
index ba9a30d334..f1cfb0b833 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -104,4 +105,4 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
 	private Date updatedTime;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionDetailDTO.java
index 9993fd7fd3..3a351978d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionDetailDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ProjectSatisfactionDetailDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionStatisticsDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionStatisticsDTO.java
index 9328ef8552..39b099e5d9 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionStatisticsDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectSatisfactionStatisticsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ProjectSatisfactionStatisticsDTO implements Serializable {
      */
     private Integer shouldEvaluateCount;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectStaffDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectStaffDTO.java
index 1140b0bbb6..f6b88dbc44 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectStaffDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectStaffDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class ProjectStaffDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java
index 60f01c7299..09387623fc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ProjectTagsDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java
index a620667571..e7240c53df 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupEditSubmitRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupEditSubmitRecordDTO.java
index 977d02f9c4..5f1f71755c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupEditSubmitRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupEditSubmitRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class GroupEditSubmitRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -128,4 +129,4 @@ public class GroupEditSubmitRecordDTO implements Serializable {
      */
 	private String messageText;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java
index 3e2435179d..22bd499514 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class GroupInvitationDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java
index 69c822c5ab..5c8c8b49e2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -116,4 +117,4 @@ Ps: 1) 入群被拒绝之后，如果再申请是插入一条新的审核中的
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupCodeDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupCodeDTO.java
index acc74838e7..34abe7f3a5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupCodeDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupCodeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ResiGroupCodeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java
index 519e09389f..c3355718ea 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class ResiGroupMemberDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java
index f84df8eb4e..0948d22718 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class ResiGroupOperationDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java
index 2bb74bf9bb..7614f532a8 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class ResiGroupStatisticalDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java
index d176a49809..26c63a3d10 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class ResiTopicAttachmentDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java
index 6bb6bc0640..9d157a7fb5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ResiTopicOperationDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftAttachmentDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftAttachmentDTO.java
index 519c1e5d13..1bf5db6c08 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftAttachmentDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -74,7 +75,7 @@ public class TopicDraftAttachmentDTO implements Serializable {
 	private Integer sort;
 
     /**
-     * 附件状态（审核中：auditing； 
+     * 附件状态（审核中：auditing；
 auto_passed: 自动通过；
 review：结果不确定，需要人工审核；
 block: 结果违规；
@@ -124,4 +125,4 @@ approved：人工审核通过）
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftDTO.java
index d46e78aa2a..71439d5d5d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -59,7 +60,7 @@ public class TopicDraftDTO implements Serializable {
 	private String topicContent;
 
     /**
-     * 话题草稿状态（审核中：auditing； 
+     * 话题草稿状态（审核中：auditing；
 auto_passed: 自动通过；
 review：结果不确定，需要人工审核；
 block: 结果违规；
@@ -84,7 +85,7 @@ approved：人工审核通过）
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
@@ -143,4 +144,4 @@ approved：人工审核通过）
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftOperationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftOperationDTO.java
index f0c554266f..4a9be29321 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftOperationDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ approved：人工审核通过
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftScanTaskDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftScanTaskDTO.java
index e6b90cb92a..a24fb13271 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftScanTaskDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicDraftScanTaskDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -101,4 +102,4 @@ block: 结果违规；】
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkRecordDTO.java
index 5d7cfb7116..5582f95b8c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class TopicShareLinkRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkVisitRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkVisitRecordDTO.java
index c3674608ae..10d034bef2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkVisitRecordDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/TopicShareLinkVisitRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.resigroup;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class TopicShareLinkVisitRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -94,4 +95,4 @@ public class TopicShareLinkVisitRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/GridMemberDataAnalysisEnums.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/GridMemberDataAnalysisEnums.java
index 2dfc6a5c1b..f359693a1d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/GridMemberDataAnalysisEnums.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/GridMemberDataAnalysisEnums.java
@@ -1,8 +1,5 @@
 package com.epmet.dataaggre.enums;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public enum GridMemberDataAnalysisEnums {
 
     SORT_SORT_PROJECT_COUNT("projectCount", "project_count"),
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java
index f4cc0d57ad..2cad62ac48 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java
@@ -2,7 +2,6 @@ package com.epmet.dataaggre.beans;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -52,4 +51,4 @@ public class GridMemberDataAnalysisExcelExportBean {
 
     @ExcelProperty(value = {"例行工作次数"})
     private int patrolRoutineWorkTimes;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
index 101313d56c..ea8e701d93 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
@@ -18,6 +18,7 @@ import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
index 4446abbd70..1fe214a4f4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrProjectTemplateCategoryDao.java
@@ -1,7 +1,5 @@
 package com.epmet.dataaggre.dao.epmettduck;
 
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PrProjectTemplateCategoryDao {
-	
-}
\ No newline at end of file
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
index 5714df590e..207bb55eef 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
@@ -3,9 +3,6 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 用户访问问卷记录表
@@ -18,4 +15,4 @@ public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
index 1532f33727..35dd1601b5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
@@ -29,7 +29,6 @@ import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.entity.govproject.ProjectEntity;
-import com.epmet.dto.ProjectCategoryDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java
index 674d6de835..c566726e36 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java
@@ -19,14 +19,12 @@ package com.epmet.dataaggre.dao.opercustomize;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.app.result.CustomerFootBarDTO;
-import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.IcUserCategoryResultDTO;
 import com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * APP底部菜单栏信息
@@ -61,4 +59,4 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
     CustomerFootBarEntity selectDefaultIcon(@Param("customerId") String customerId, @Param("appType")String appType, @Param("barKey")String barKey);
 
     List<IcUserCategoryResultDTO> queryCustomerIcResiCategoryStatsConfig(String customerId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactGridMemberStatisticsDailyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactGridMemberStatisticsDailyEntity.java
index dbcc2d5f26..397f7fb437 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactGridMemberStatisticsDailyEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactGridMemberStatisticsDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.datastats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 网格员数据统计_日统计
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
index 8573983676..530eceb846 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 第三方用户授权信息
  *
@@ -39,7 +36,7 @@ public class AcUserAuthorizeEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
index 3b6f74e8ab..8968997e5e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,7 @@ public class AcUserEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
index c575a16456..d43828235a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目模板分类
  *
@@ -39,7 +36,7 @@ public class PrProjectTemplateCategoryEntity extends BaseEpmetEntity{
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
index 6d87744261..70ce4c0720 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目表
  *
@@ -39,7 +36,7 @@ public class PrProjectTemplateEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
index 4b109d6df9..4d2fa610e8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目表单项
  *
@@ -39,7 +36,7 @@ public class PrProjectTemplateItemEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -59,7 +56,7 @@ public class PrProjectTemplateItemEntity extends BaseEpmetEntity {
 	private String formItemId;
 
     /**
-     * 表单项类型 
+     * 表单项类型
      */
 	private String type;
 
@@ -104,7 +101,7 @@ public class PrProjectTemplateItemEntity extends BaseEpmetEntity {
 	private String expand;
 
     /**
-     * 正则表达式 
+     * 正则表达式
      */
 	private String regList;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
index b3790a9b43..9973532c12 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目主题外观模板
  *
@@ -39,7 +36,7 @@ public class PrProjectThemeEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
index c69e65d3f1..cb979e86ac 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目发布范围表
  *
@@ -39,7 +36,7 @@ public class PrPublishRangeEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
index 00029fd51b..69d16ab575 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 问卷填写附属信息表
  *
@@ -39,7 +36,7 @@ public class PrResultExtEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
index 5d06a44213..7b84511271 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java
@@ -19,13 +19,10 @@ package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目表
  *
@@ -40,7 +37,7 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
index 7c565fed9e..56643376c6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目逻辑
  *
@@ -59,7 +56,7 @@ public class PrUserProjectLogicEntity extends BaseEpmetEntity {
 	private String formItemId;
 
     /**
-     * 条件选项 
+     * 条件选项
      */
 	private Integer expression;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
index 9f46a03222..00722744fb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目表单项
  *
@@ -39,7 +36,7 @@ public class PrUserProjectResultEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
index d4b352e21b..4884b94d6d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,7 @@ public class PrUserProjectSettingEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -79,7 +78,7 @@ public class PrUserProjectSettingEntity extends BaseEpmetEntity {
 	private Integer isWxWrite;
 
     /**
-     * 
+     *
      */
 	private Integer isWxWriteOnce;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
index db6d6192a8..4da1727bc9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目表单项
  *
@@ -39,7 +36,7 @@ public class PrUserProjectThemeEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
index e51905536c..8a55763b8d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmettduck;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 微信公众号用户 
+ * 微信公众号用户
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
@@ -64,12 +61,12 @@ public class WxMpUserEntity extends BaseEpmetEntity {
 	private String headImgUrl;
 
     /**
-     * 
+     *
      */
 	private String unionId;
 
     /**
-     * 
+     *
      */
 	private String openId;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeCertificationConfigFieldEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeCertificationConfigFieldEntity.java
index 81b970e677..708ce0da10 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeCertificationConfigFieldEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeCertificationConfigFieldEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  徽章认证配置字段表
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeEntity.java
index a70ecfb4f9..092131860c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/BadgeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 徽章
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerStaffEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerStaffEntity.java
index 479c5f7c0f..b0b7083b99 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerStaffEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerStaffEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java
index be03ad7913..6c6e43ecb7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 政府端角色表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java
index aa6b1e6db9..05a1b977ca 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 政府端角色模板表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridLatestEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridLatestEntity.java
index a04455241d..361791cc64 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridLatestEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridLatestEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 最近访问网格表 
+ * 最近访问网格表
 记录用户访问网格的最近一次记录，对同一网格只记录一条记录，同一网格每次只更新最近一次访问的时间
  *
  * @author generator generator@elink-cn.com
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridVisitedEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridVisitedEntity.java
index 07141923e3..0af2794099 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridVisitedEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GridVisitedEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/OperUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/OperUserEntity.java
index 95f1ca70c9..ef3b2d2083 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/OperUserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/OperUserEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 运营人员表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java
index 056d0b8fd8..4c21db9b8d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 注册关系表 用于统计客户网格的注册居民数
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/ResiUserBadgeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/ResiUserBadgeEntity.java
index 497bccd06c..061437cf2c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/ResiUserBadgeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/ResiUserBadgeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户徽章关系表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RoleEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RoleEntity.java
index fe0dc92157..afc9bed1b6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RoleEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RoleEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffAgencyVisitedEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffAgencyVisitedEntity.java
index d12bb12dd7..e7d7fa9539 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffAgencyVisitedEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffAgencyVisitedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员进入组织日志表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffGridVisitedEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffGridVisitedEntity.java
index a955852f0e..d1591ede01 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffGridVisitedEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffGridVisitedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员进入网格日志表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java
index c74f88b459..44e5de7b58 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java
index 0ad2407f74..27c4fbea43 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java
index 9cfbbe1ea8..c2f971a6ec 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员-角色关系表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java
index b4085694fc..4186a9348c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 工作人员微信关系表 
+ * 工作人员微信关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceEntity.java
index e790bbba8f..9cbf0af571 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -54,12 +53,12 @@ public class UserAdviceEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String agencyPids;
 
     /**
-     * 
+     *
      */
 	private String agencyAllParentName;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceImgEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceImgEntity.java
index d157d519c5..98a3a23870 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceImgEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserAdviceImgEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户建议图片
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBadgeCertificateRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBadgeCertificateRecordEntity.java
index b00adb94f2..5abab00d42 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBadgeCertificateRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBadgeCertificateRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,7 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBaseInfoEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBaseInfoEntity.java
index 52c1961193..4b4860f026 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBaseInfoEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserBaseInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户基础信息
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserCustomerEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserCustomerEntity.java
index 6909b3dad8..e00bb75eeb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserCustomerEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserCustomerEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 用户客户关系表 
+ * 用户客户关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java
index f58f84e9c7..04717532bf 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 用户表 
+ * 用户表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserInvitationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserInvitationEntity.java
index 7f5d8c8cbe..5509df44fa 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserInvitationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserInvitationEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiInfoEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiInfoEntity.java
index 11f98da9e0..d01e17ce23 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiInfoEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户居民端注册信息表  用户在居民端完善的个人信息
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiRegisterVisitEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiRegisterVisitEntity.java
index e49ea4164c..4454f72943 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiRegisterVisitEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserResiRegisterVisitEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserRoleEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserRoleEntity.java
index 78cbcc96fc..db0450de24 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserRoleEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserRoleEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 用户角色关系表 
+ * 用户角色关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java
index 30cab00c14..7ce430dc03 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.dataaggre.entity.epmetuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 用户微信端关系表 
+ * 用户微信端关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-25
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectCategoryEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectCategoryEntity.java
index 75716092e7..50dfc42c53 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectCategoryEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectCategoryEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目所属分类表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectEntity.java
index 45ea76b9d7..77c0766d66 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java
index 247d85b928..3cba94b48f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessAttachmentEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessAttachmentEntity.java
index 62b9ca896a..dcaa1cfbf1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessAttachmentEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目节点附件表
  *
@@ -104,7 +101,7 @@ public class ProjectProcessAttachmentEntity extends BaseEpmetEntity {
 	private Integer isRelease;
 
     /**
-     * 附件审核状态（审核中：auditing； 
+     * 附件审核状态（审核中：auditing；
 auto_passed: 自动通过；
 review：结果不确定，需要人工审核；
 block: 结果违规；
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessEntity.java
index 661dc19df3..aae40eaee6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessScanTaskEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessScanTaskEntity.java
index 3a14d8cb52..361757f46f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessScanTaskEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectProcessScanTaskEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目节点附件安全校验任务表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java
index c77447baa6..2e519c3ddd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目相关人员表(存放话题人、议题人数据)
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionDetailEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionDetailEntity.java
index 2335585826..8b806ccdf7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionDetailEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionDetailEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.govproject;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目满意度调查记录表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionStatisticsEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionStatisticsEntity.java
index d3c93ba38c..b47856b61d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionStatisticsEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectSatisfactionStatisticsEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.govproject;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目满意度调查统计表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectStaffEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectStaffEntity.java
index 02b37cafc6..b15afc554b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectStaffEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectStaffEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目人员关联表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectTagsEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectTagsEntity.java
index b8cb424054..5a3d6cacab 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectTagsEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectTagsEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.govproject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目关联标签表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupEditSubmitRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupEditSubmitRecordEntity.java
index e3d3e1a215..a2cc86600f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupEditSubmitRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupEditSubmitRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java
index 45edf9174c..0c9196af10 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java
@@ -20,7 +20,6 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java
index 55a976df65..65c738b357 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 组成员出入群记录表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupCodeEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupCodeEntity.java
index a9a2fb7dc3..5d95302a63 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupCodeEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupCodeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组二维码 小组唯一二维码，海报码和小组码是同一个二维码，长期有效的
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java
index 33b4b9243e..906b5a88ea 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java
index 3736c8ebaa..40a4c657b0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 群组成员关系表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java
index db99ac76f4..8e500fb11b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 群组操作日志表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java
index baa8ec6846..91e3ae797c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 群组统计信息表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java
index 19bcf9837b..172fd931fc 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题附件表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java
index d5ae0ea960..0debdf3547 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题信息表
  *
@@ -46,7 +43,7 @@ public class ResiTopicEntity extends BaseEpmetEntity {
 	private String groupId;
 
     /**
-     * 
+     *
      */
 	private String topicContent;
 
@@ -71,7 +68,7 @@ public class ResiTopicEntity extends BaseEpmetEntity {
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java
index 612dc96087..7dfb6a07d0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.dataaggre.entity.resigroup;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题操作日志表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftAttachmentEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftAttachmentEntity.java
index 3881f99f81..527fd89dba 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftAttachmentEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题草稿附件表
  *
@@ -74,7 +71,7 @@ public class TopicDraftAttachmentEntity extends BaseEpmetEntity {
 	private Integer sort;
 
     /**
-     * 附件状态（审核中：auditing； 
+     * 附件状态（审核中：auditing；
 auto_passed: 自动通过；
 review：结果不确定，需要人工审核；
 block: 结果违规；
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftEntity.java
index c3fd045e30..7c9aa90a35 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题草稿内容表
  *
@@ -59,7 +56,7 @@ public class TopicDraftEntity extends BaseEpmetEntity {
 	private String topicContent;
 
     /**
-     * 话题草稿状态（审核中：auditing； 
+     * 话题草稿状态（审核中：auditing；
 auto_passed: 自动通过；
 review：结果不确定，需要人工审核；
 block: 结果违规；
@@ -84,7 +81,7 @@ approved：人工审核通过）
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftOperationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftOperationEntity.java
index 7cb5c3260b..c28ba9195b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftOperationEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftOperationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题草稿操作日志表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftScanTaskEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftScanTaskEntity.java
index 72b2f3c3c2..4a04a0e408 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftScanTaskEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicDraftScanTaskEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题附件检测任务表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkRecordEntity.java
index f1145c4a43..a574e00f6a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题分享链接表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkVisitRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkVisitRecordEntity.java
index 7a3bb3e514..9570c36087 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkVisitRecordEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/TopicShareLinkVisitRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.dataaggre.entity.resigroup;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题分享链接访问记录表
  *
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/ResiGroupRedis.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/ResiGroupRedis.java
index 3639a7a8d8..459ac63a0b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/ResiGroupRedis.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/ResiGroupRedis.java
@@ -10,7 +10,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author zxc
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java
index 85a447a88c..7555a65249 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java
@@ -2,7 +2,6 @@ package com.epmet.dataaggre.service;
 
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.Date;
 import java.util.List;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index dcda985bf4..754ee01d50 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -10,13 +10,11 @@ import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
index 43f9db3b22..e765ec6b30 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.RenException;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java
index 360af280e9..3ddd0b11d0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrProjectTemplateCategoryService.java
@@ -1,8 +1,5 @@
 package com.epmet.dataaggre.service.epmettduck;
 
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateCategoryEntity;
-
 /**
  * 项目模板分类
  *
@@ -11,4 +8,4 @@ import com.epmet.dataaggre.entity.epmettduck.PrProjectTemplateCategoryEntity;
  */
 public interface PrProjectTemplateCategoryService {
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
index 74d1ddd332..3f230b4326 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java
@@ -1,14 +1,10 @@
 package com.epmet.dataaggre.service.epmettduck;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 项目表单项
@@ -25,4 +21,4 @@ public interface PrUserProjectItemService extends IService<PrUserProjectItemEnti
      * @date 2021/9/16 2:51 下午
      */
     List<PrUserProjectItemEntity> queryProjectItem(TDuckDetailFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
index 3078d9221c..db2f997635 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java
@@ -17,9 +17,9 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
-import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
@@ -61,4 +61,4 @@ public class PrUserProjectItemServiceImpl extends ServiceImpl<PrUserProjectItemD
         }
         return itemEntityList;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java
index 98f41f75a3..4899fa20c3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java
@@ -30,7 +30,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 5dc796e562..3e0363caa9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -613,7 +613,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId);
         CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class);
         //设置行政地区编码全路径
-        if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) {
+        if (null != res && StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) {
             res.setAreaCodePath(queryAreaCodePath(res));
         }
         return res;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
index fccf574544..cb72d62d07 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.service.govproject;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index ed8b7928dc..3c4ea9f65c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -11,7 +11,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
-import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java
index af5f40e53f..25b200cc7a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java
@@ -5,7 +5,6 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.opercrm.CustomerRelationDao;
 import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index d0cd285b19..bee2fa8be9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -32,7 +32,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java
index a5f33265d5..cb628a8f0d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class StaffPatrolDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolRecordDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolRecordDTO.java
index ef6b517d61..da2a3ae27f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolRecordDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class StaffPatrolRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
index 60683bf779..9e0a90627d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
@@ -19,7 +19,6 @@ package com.epmet.dto.result;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 
@@ -43,4 +42,4 @@ public class ParentListResultDTO implements Serializable {
     private String name = "";
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueAvgAuditTimeDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueAvgAuditTimeDTO.java
index 9e1b9c346b..8677444cc1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueAvgAuditTimeDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/issue/IssueAvgAuditTimeDTO.java
@@ -2,9 +2,6 @@ package com.epmet.dto.result.issue;
 
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
 public class IssueAvgAuditTimeDTO {
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/GridProjectCountResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/GridProjectCountResultDTO.java
index 3f035afd94..4493ffe165 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/GridProjectCountResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/GridProjectCountResultDTO.java
@@ -2,8 +2,6 @@ package com.epmet.dto.result.project;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class GridProjectCountResultDTO {
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java
index 261c8b775d..66a76064f3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java
@@ -3,8 +3,6 @@ package com.epmet.evaluationindex.index.result;
 import com.epmet.evaluationindex.index.dto.IndexExplainDTO;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * desc:得分明细说明结果类
  *
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgeDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgeDistributionResultDTO.java
index 616d9207c4..2988782742 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgeDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgeDistributionResultDTO.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedList;
 
 /**
  *  公益互助-志愿者画像
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GenderDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GenderDistributionResultDTO.java
index e36589103a..c27360e034 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GenderDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GenderDistributionResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedList;
 
 /**
  *  公益互助-志愿者画像
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartActcounttrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartActcounttrendResultDTO.java
index 4ebc3422d0..78fd49ea30 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartActcounttrendResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartActcounttrendResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
-import rx.internal.util.LinkedArrayList;
 
 import java.io.Serializable;
 import java.util.LinkedList;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartVolunteerportrayalResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartVolunteerportrayalResultDTO.java
index 2bbcd82df1..d97ad2876d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartVolunteerportrayalResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/HeartVolunteerportrayalResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedList;
 
 /**
  *  公益互助-志愿者画像
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankListResultDTO.java
index d2909faffd..e4c36384ed 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankListResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankListResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  *  热心市民积分排行列表--接口返参
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java
index b93bcc24f2..862013f1a6 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java
@@ -3,7 +3,6 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
-import com.epmet.feign.impl.DataReportOpenFeignClientFallBack;
 import com.epmet.feign.impl.DataReportOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java
index 6fc231e853..247fe4499b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java
@@ -5,7 +5,6 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.feign.DataReportOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 //@Component
 public class DataReportOpenFeignClientFallBack implements DataReportOpenFeignClient {
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/form/GroupIncrTrendFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/form/GroupIncrTrendFormDTO.java
index 627b5504c4..bffcaa918b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/form/GroupIncrTrendFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/form/GroupIncrTrendFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.group.dto.form;
 
 import lombok.Data;
-import lombok.NonNull;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java
index d351ae7346..eded117589 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java
@@ -20,8 +20,6 @@ package com.epmet.project.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 public class CustomerCategoryDTO implements Serializable {
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDTO.java
index 31b5334303..12f78b250f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDTO.java
@@ -20,7 +20,6 @@ package com.epmet.publicity.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -60,4 +59,4 @@ public class FactTagViewedAgencyDTO implements Serializable {
     private String tagId;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
index 1d269eddbd..89821ad01b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/group/GroupController.java
@@ -4,12 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.group.GroupService;
 import com.epmet.group.dto.form.GroupIncrTrendFormDTO;
 import com.epmet.group.dto.result.GroupIncrTrendResultDTO;
 import com.epmet.group.dto.result.GroupSubAgencyResultDTO;
 import com.epmet.group.dto.result.GroupSubGridResultDTO;
 import com.epmet.group.dto.result.GroupSummaryInfoResultDTO;
-import com.epmet.datareport.service.group.GroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
index afc732802d..95643a67b5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/issue/IssueController.java
@@ -3,9 +3,9 @@ package com.epmet.datareport.controller.issue;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.datareport.service.issue.IssueService;
 import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
 import com.epmet.issue.dto.result.*;
-import com.epmet.datareport.service.issue.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
index abd9b25e92..29ad46cb30 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
@@ -11,14 +11,6 @@ import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantity
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import com.epmet.datareport.service.project.ProjectService;
 import com.epmet.dto.form.ProcessListFormDTO;
-import com.epmet.dto.form.screen.EfficiencyAnalysisFormDTO;
-import com.epmet.dto.form.screen.QueryQuantityMonthlyFormDTO;
-import com.epmet.dto.form.screen.ScreenCommonFormDTO;
-import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO;
-import com.epmet.dto.result.screen.ProjectQuantityResultDTO;
-import com.epmet.dto.result.screen.QueryQuantityMonthlyResultDTO;
-import com.epmet.datareport.service.project.ProjectService;
-import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
 import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.constant.ProjectConstant;
@@ -130,7 +122,7 @@ public class ProjectController {
      * @author yinzuomei
      * @description 难点赌点-耗时最长|涉及部门最多|处理次数 返回该组织下所有的难点堵点的 数据
      * 2021.06.21新增次API,多客户版本，eg:平阴县的工作人员可以看到8个街道的难点赌点
-     * @Date 2021/6/23 13:09 
+     * @Date 2021/6/23 13:09
      **/
     @PostMapping("difficultyrank-multic")
     public Result<List<ProjectDifficultRankResultDTO>> difficultyRankMultic(@RequestHeader("CustomerId") String customerId,@RequestBody DifficultyRankFormDTO formDTO){
@@ -138,7 +130,7 @@ public class ProjectController {
         ValidatorUtils.validateEntity(formDTO, DifficultyRankFormDTO.DifficultyRankInternalGroup.class);
         return new Result<List<ProjectDifficultRankResultDTO>>().ok(projectService.difficultyRankMultic(formDTO));
     }
-    
+
     /**
      * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
@@ -159,13 +151,13 @@ public class ProjectController {
      * @description 001、难点堵点-组织下拉框
      * 需求描述：下拉框显示当前用户所属组织和下级组织 ；1）如果当前用户是街道工作人员， 显示所属街道和该街道下的社区+直属网格；2）如果当前用户是社区人员， 显示所属社区和该社区下的网格+直属网格。
      * 210622: 新增此API， 后端改为从指标库取值 ， 保证平阴县的工作人员，看到的下拉框是平阴县、以及8个街道
-     * @Date 2021/6/22 14:20 
+     * @Date 2021/6/22 14:20
      **/
     @PostMapping("mynextagency-multic")
     public Result<List<ProjectNextAgencyResultDTO>> myNextAgencyMultic(@LoginUser TokenDto tokenDto){
         return new Result<List<ProjectNextAgencyResultDTO>>().ok(projectService.myNextAgencyMultic(tokenDto.getUserId(),tokenDto.getCustomerId()));
     }
-    
+
     /**
      * 002、项目分类字典查询
      *      查询当前客户的父客户下，项目分类字典
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
index f01540758c..3cb6b66395 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/publicity/PublicityController.java
@@ -22,9 +22,9 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.publicity.PublicityService;
 import com.epmet.publicity.dto.form.TagFormDTO;
 import com.epmet.publicity.dto.result.*;
-import com.epmet.datareport.service.publicity.PublicityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -129,4 +129,4 @@ public class PublicityController {
         return new Result<List<FactPublishedGridDTO>>().ok(publicityService.subgridPublishedarticle(tokenDto, type));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
index 42dc88cd77..747199ee6a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
@@ -8,7 +8,10 @@ import com.epmet.evaluationindex.screen.dto.form.AgencyFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.AgencyNumTypeParamFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
index 855be093c1..99fdd3787a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
@@ -4,15 +4,14 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
 import com.epmet.dto.PageFormDTO;
+import com.epmet.dto.result.issue.KcIssueSummary;
+import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
 import com.epmet.dto.result.project.*;
 import com.epmet.dto.result.user.*;
 import com.epmet.evaluationindex.screen.dto.form.GroupTopicShiftIssueRatioRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.GroupUserCountRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
-import com.epmet.dto.result.issue.KcIssueSummary;
-import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
index f01e9dbe77..a0d83807b5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
@@ -3,17 +3,20 @@ package com.epmet.datareport.controller.user;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.user.StaffPatrolDetailService;
-import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.form.PatrolTrackFormDTO;
 import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.dto.form.PatrolCountFormDTO;
-import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.dto.result.PatrolCountResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
-import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.user.form.GridManagerListFormDTO;
 import com.epmet.user.result.GridManagerListGeneralResultDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
index a78d744487..67f6dd9c5f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/UserAnalysisController.java
@@ -4,12 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.user.UserAnalysisService;
 import com.epmet.dto.form.user.UserIncrTrendFormDTO;
 import com.epmet.dto.form.user.UserSubAgencyFormDTO;
 import com.epmet.dto.form.user.UserSubGridFormDTO;
 import com.epmet.dto.form.user.UserSummaryInfoFormDTO;
 import com.epmet.dto.result.user.*;
-import com.epmet.datareport.service.user.UserAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index 5883d352e7..051a6ec3e6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -20,7 +20,6 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 import com.epmet.dto.ScreenCustomerAgencyCommonDTO;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.result.ParentListResultDTO;
-import com.epmet.dto.ScreenCustomerAgencyCommonDTO;
 import com.epmet.dto.result.ScreenCustomerAgencyDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.dto.result.plugins.DeptNodeDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index 93b6564f87..a077dd19cd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -19,7 +19,6 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.result.screen.CategoryAnalysisResultDTO;
 import com.epmet.project.CustomerProjectCategoryDTO;
-import com.epmet.project.dto.form.ProjectCategoryFormDTO;
 import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
 import com.epmet.project.dto.result.ProjectCategoryResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -83,4 +82,4 @@ public interface ScreenProjectCategoryOrgDailyDao {
 	 */
 	List<ProjectCategoryResultDTO> selectCategoryByCustomerId(@Param("customerId")String customerId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectOrgDailyDao.java
index aeb20bdb97..f6ee035adf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectOrgDailyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectOrgDailyDao.java
@@ -19,7 +19,6 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO;
 import com.epmet.dto.result.screen.ProjectQuantityResultDTO;
-import com.epmet.project.dto.form.ProjectCategoryFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -51,4 +50,4 @@ public interface ScreenProjectOrgDailyDao {
 
     Integer selectProjectTotalByGrid(@Param("customerId")String customerId,@Param("time")String time,@Param("orgId")String orgId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java
index 6589571c66..b5e9a891a4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java
@@ -23,8 +23,6 @@ import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 志愿者服务情况统计
  *
@@ -41,4 +39,4 @@ public interface FactVolunteerServiceDailyDao extends BaseDao<FactVolunteerServi
      * @return
      */
     VolunteerDemandServiceStatsResultDTO getLatestVolunteerDemandServiceStats(@Param("customerId") String customerId, @Param("agencyPids") String agencyPids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/IndexDictDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/IndexDictDao.java
index 893820cf1c..542d91bf47 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/IndexDictDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/IndexDictDao.java
@@ -22,7 +22,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 评价指标字典
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueSummaryGridDailyDTO.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueSummaryGridDailyDTO.java
index 605b75cf34..9dc7407626 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueSummaryGridDailyDTO.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueSummaryGridDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.datareport.dao.issue;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -153,4 +154,4 @@ public class ScreenKcIssueSummaryGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueTrendGridMonthlyDTO.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueTrendGridMonthlyDTO.java
index 527aaa443c..7d04e7ef16 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueTrendGridMonthlyDTO.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/issue/ScreenKcIssueTrendGridMonthlyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.datareport.dao.issue;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class ScreenKcIssueTrendGridMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java
index 19849b856b..37db0b376b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java
@@ -20,8 +20,8 @@ package com.epmet.datareport.dao.user;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.datareport.entity.user.StaffPatrolRecordEntity;
 import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -51,5 +51,5 @@ public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
      * @date 2021/6/9 10:24 上午
      */
     List<GridManagerListResultDTO> selectLL(@Param("userIds")List<String> userIds);
-	
-}
\ No newline at end of file
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java
index fd00e1b58f..b26c6025b4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.datareport.entity.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolRecordEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolRecordEntity.java
index 7c37dd2813..a5abbfe0b2 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolRecordEntity.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.datareport.entity.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java
index 639d39526f..b5280da102 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java
@@ -5,7 +5,6 @@ import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.datareport.constant.FactConstant;
 import com.epmet.datareport.service.backdoor.BackDoorService;
 import com.epmet.dto.result.AppIdInfoResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
index 480601a129..d7e53dffc6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
@@ -10,8 +10,6 @@ import com.epmet.evaluationindex.screen.dto.result.*;
 
 import java.util.List;
 
-import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
-
 /**
  * 孔村大屏api
  *
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java
index 2f268cd35e..041c2376b3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java
@@ -14,7 +14,6 @@ import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResu
 import com.epmet.project.dto.form.CategoryProjectListFormDTO;
 import com.epmet.project.dto.form.CategoryTopAppealFormDTO;
 import com.epmet.project.dto.form.ProjectCategoryFormDTO;
-import com.epmet.project.dto.result.CategoryProjectListResultDTO;
 import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
 import com.epmet.project.dto.result.PageCategoryProjectListResultDTO;
 import com.epmet.project.dto.result.ProjectCategoryResultDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java
index a13fe2fe34..7e3da8daf4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
index 6a84e531d7..e04b7f5cf3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
@@ -14,9 +14,6 @@ import com.epmet.evaluationindex.screen.dto.form.GroupTopicShiftIssueRatioRankFo
 import com.epmet.evaluationindex.screen.dto.form.GroupUserCountRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.HeartVolunteerrankFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
-import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
-import com.epmet.dto.result.issue.KcIssueSummary;
-import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java
index 72cc5f40cc..56a3e09a40 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java
@@ -32,7 +32,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -98,4 +101,4 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl implements ScreenProject
         return resultDTO;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index 72b254a180..2d6a81ddf3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -34,7 +34,10 @@ import com.epmet.project.CustomerProjectCategoryDTO;
 import com.epmet.project.dto.form.CategoryProjectListFormDTO;
 import com.epmet.project.dto.form.CategoryTopAppealFormDTO;
 import com.epmet.project.dto.form.ProjectCategoryFormDTO;
-import com.epmet.project.dto.result.*;
+import com.epmet.project.dto.result.CategoryProjectListResultDTO;
+import com.epmet.project.dto.result.CategoryTopAppealResultDTO;
+import com.epmet.project.dto.result.PageCategoryProjectListResultDTO;
+import com.epmet.project.dto.result.ProjectCategoryResultDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java
index be4faf115d..e9177b2ddb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/group/impl/GroupServiceImpl.java
@@ -3,13 +3,13 @@ package com.epmet.datareport.service.group.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.datareport.dao.group.GroupDao;
+import com.epmet.datareport.service.group.GroupService;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.group.constant.GroupConstant;
 import com.epmet.group.dto.form.GroupIncrTrendFormDTO;
 import com.epmet.group.dto.result.*;
-import com.epmet.datareport.service.group.GroupService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java
index 86953616b1..13d4c772e9 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/issue/impl/IssueServiceImpl.java
@@ -4,13 +4,13 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.datareport.dao.issue.IssueDao;
+import com.epmet.datareport.service.issue.IssueService;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.issue.constant.IssueConstant;
 import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
 import com.epmet.issue.dto.result.*;
-import com.epmet.datareport.service.issue.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
index e2d1a06654..ac047925d8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
@@ -1,10 +1,10 @@
 package com.epmet.datareport.service.project;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
 import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.dto.form.DifficultyRankFormDTO;
-import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.*;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java
index 9a8ceaca2f..96185776c7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/publicity/impl/PublicityServiceImpl.java
@@ -20,11 +20,11 @@ package com.epmet.datareport.service.publicity.impl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.datareport.dao.publicity.PublicityDao;
+import com.epmet.datareport.service.publicity.PublicityService;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.publicity.dto.result.*;
-import com.epmet.datareport.service.publicity.PublicityService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -225,4 +225,4 @@ public class PublicityServiceImpl implements PublicityService {
         return data.getAgencyId();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java
index 12889caaae..b3afd669be 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/topic/impl/TopicServiceImpl.java
@@ -3,10 +3,10 @@ package com.epmet.datareport.service.topic.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.datareport.dao.topic.TopicDao;
+import com.epmet.datareport.service.topic.TopicService;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.datareport.service.topic.TopicService;
 import com.epmet.topic.constant.TopicConstant;
 import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
 import com.epmet.topic.dto.result.*;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java
index 8bc7a6c4b6..430f136715 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java
@@ -1,14 +1,14 @@
 package com.epmet.datareport.service.user;
 
-import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.form.PatrolTrackFormDTO;
 import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.dto.form.PatrolCountFormDTO;
-import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.dto.result.PatrolCountResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
-import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.user.form.GridManagerListFormDTO;
 import com.epmet.user.result.GridManagerListGeneralResultDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
 
 import java.util.List;
 
@@ -60,4 +60,4 @@ public interface StaffPatrolDetailService{
      */
     PatrolCountResultDTO patrolCount(PatrolCountFormDTO formDTO);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java
index adec1862e9..34f5322af5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java
@@ -9,16 +9,15 @@ import com.epmet.datareport.dao.user.StaffPatrolDetailDao;
 import com.epmet.datareport.dao.user.StaffPatrolRecordDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService;
 import com.epmet.datareport.service.user.StaffPatrolDetailService;
+import com.epmet.dto.form.PatrolCountFormDTO;
+import com.epmet.dto.form.PatrolTrackFormDTO;
+import com.epmet.dto.form.RecordListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.user.form.GridManagerListFormDTO;
-import com.epmet.dto.form.PatrolTrackFormDTO;
-import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.dto.form.PatrolCountFormDTO;
-import com.epmet.user.result.GridManagerListResultDTO;
-import com.epmet.dto.result.PatrolCountResultDTO;
 import com.epmet.user.result.GridManagerListGeneralResultDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
index 7b6e81d2e0..01d1fa7912 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
@@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserAnalysisConstant;
 import com.epmet.datareport.dao.user.UserAnalysisDao;
+import com.epmet.datareport.service.user.UserAnalysisService;
 import com.epmet.dto.DimAgencyDTO;
 import com.epmet.dto.DimDepartmentDTO;
 import com.epmet.dto.DimGridDTO;
@@ -21,7 +22,6 @@ import com.epmet.dto.form.user.UserSummaryInfoFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.user.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.datareport.service.user.UserAnalysisService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java
index 7702a90a4b..6f09166313 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyProjectFormDTO.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridGroupTotalFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridGroupTotalFormDTO.java
index 8fb2dc7e25..4dfb48d56e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridGroupTotalFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridGroupTotalFormDTO.java
@@ -3,10 +3,8 @@ package com.epmet.dto.basereport.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridTopicIssueFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridTopicIssueFormDTO.java
index bd40463640..3643809818 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridTopicIssueFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridTopicIssueFormDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectActionDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectActionDTO.java
index fc179c63e9..d94bcde312 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectActionDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectActionDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class DimObjectActionDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectStatusDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectStatusDTO.java
index 28128a83ce..cc418fd4c4 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectStatusDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/DimObjectStatusDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class DimObjectStatusDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java
index 818d5a399c..c3b9ff68ee 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.extract;
 
+import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
-import lombok.Data;
-
 
 /**
  * 业务数据抽取-小组相关
@@ -131,22 +131,22 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
@@ -157,4 +157,4 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 
 
 	private List<ExtractGroupMemberActionRecordResultDTO> members = new ArrayList();
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java
index 42ec5cd2b7..ebef36f090 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-05-12
@@ -124,23 +125,23 @@ public class FactOriginGroupMemberDailyDTO implements Serializable {
 	private String delFlag;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueLogDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueLogDailyDTO.java
index 433f95177e..3611ba48fc 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueLogDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueLogDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -133,4 +134,4 @@ public class FactOriginIssueLogDailyDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueMainDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueMainDailyDTO.java
index a77815e3ea..4ad6d23323 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueMainDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueMainDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -149,4 +150,4 @@ public class FactOriginIssueMainDailyDTO implements Serializable {
         this.createdBy = "APP_USER";
         this.updatedBy = "APP_USER";
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java
index 13e1e5fba7..0c8716c8de 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -178,4 +179,4 @@ public class FactOriginProjectMainDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectOrgPeriodDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectOrgPeriodDailyDTO.java
index e9bb3e944e..ac60e4f976 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectOrgPeriodDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectOrgPeriodDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class FactOriginProjectOrgPeriodDailyDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -46,7 +47,7 @@ public class FactOriginProjectOrgPeriodDailyDTO implements Serializable {
 	private String projectId;
 
     /**
-     * 
+     *
      */
 	private String orgId;
 
@@ -106,23 +107,23 @@ public class FactOriginProjectOrgPeriodDailyDTO implements Serializable {
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GovernAbilityGridMonthlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GovernAbilityGridMonthlyFormDTO.java
index 890e663083..4c1ed7eb6e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GovernAbilityGridMonthlyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GovernAbilityGridMonthlyFormDTO.java
@@ -17,16 +17,14 @@
 
 package com.epmet.dto.extract.form;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * 治理能力-网格相关事实表 
+ * 治理能力-网格相关事实表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-18
@@ -145,4 +143,4 @@ public class GovernAbilityGridMonthlyFormDTO implements Serializable {
         this.createdBy = "APP_USER";
         this.updatedBy = "APP_USER";
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java
index 5cbaa9f748..7c83123080 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.extract.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author zxc
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/PartyAbilityGridMonthlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/PartyAbilityGridMonthlyFormDTO.java
index de69be568b..5ba183a5e0 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/PartyAbilityGridMonthlyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/PartyAbilityGridMonthlyFormDTO.java
@@ -17,16 +17,14 @@
 
 package com.epmet.dto.extract.form;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * 党建能力-网格相关事实表 
+ * 党建能力-网格相关事实表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-19
@@ -175,4 +173,4 @@ public class PartyAbilityGridMonthlyFormDTO implements Serializable {
         this.createdBy = "APP_USER";
         this.updatedBy = "APP_USER";
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectToProjectMainDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectToProjectMainDTO.java
index 7d06186528..47e7edc591 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectToProjectMainDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridProjectToProjectMainDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dto.extract.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -53,4 +52,4 @@ public class GridProjectToProjectMainDTO implements Serializable {
 	private String isResolved;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java
index 1e9c927663..6688071da6 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ProjectEvaluateResultDTO.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @Author zxc
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/AgencyMonthlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/AgencyMonthlyFormDTO.java
index ec00bcc11f..691bd9070f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/AgencyMonthlyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/AgencyMonthlyFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.group.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author zxc
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexGovrnAblityGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexGovrnAblityGridMonthlyDTO.java
index 80ec8c7100..b58f6e167f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexGovrnAblityGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexGovrnAblityGridMonthlyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.indexcollect;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 治理能力-网格相关事实表 
+ * 治理能力-网格相关事实表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-26
@@ -139,4 +139,4 @@ public class FactIndexGovrnAblityGridMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexPartyAblityGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexPartyAblityGridMonthlyDTO.java
index 901ff46b9e..9d4560540c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexPartyAblityGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexPartyAblityGridMonthlyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.indexcollect;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 党建能力-网格相关事实表 
+ * 党建能力-网格相关事实表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-26
@@ -164,4 +164,4 @@ public class FactIndexPartyAblityGridMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexServiceAblityGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexServiceAblityGridMonthlyDTO.java
index decd896d03..4c866f487f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexServiceAblityGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/FactIndexServiceAblityGridMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.indexcollect;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 服务能力-网格相关事实表
@@ -114,4 +114,4 @@ public class FactIndexServiceAblityGridMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityDataFormDTO.java
index fec0ca391a..340905cc5a 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityDataFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.indexcollect.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityDataFormDTO.java
index 0e845a808f..29c9d3955c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityDataFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.indexcollect.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityDataFormDTO.java
index d6f2e68d5c..0c14bcaa9e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityDataFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.indexcollect.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
index 6e6eccd2e4..174e725d33 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
@@ -1,12 +1,8 @@
 package com.epmet.dto.indexcollect.form;
 
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityDataFormDTO.java
index 59e03a058c..07620192be 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityDataFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.indexcollect.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgPartyAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgPartyAbilityFormDTO.java
index cc1401d424..c8b127130d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgPartyAbilityFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgPartyAbilityFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.indexcollect.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 3、党建能力-街道及社区相关指标 入参
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java
index 59050bced2..e6f5a6f1be 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.indexcollect.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 5、服务能力-组织（街道|社区|全区）相关指标 入参
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java
index 872dbc96a2..79d31cb8e3 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.issue;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class IssueProjectCategoryDictDTO implements Serializable {
      */
 	private String color;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenCustomerWorkRecordDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenCustomerWorkRecordDictDTO.java
index 9718304450..fb7f3d343c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenCustomerWorkRecordDictDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenCustomerWorkRecordDictDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.plugins;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class ScreenCustomerWorkRecordDictDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java
index b0ff888330..80113b1fc6 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.project.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author sun
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java
index bd88161f54..2f80c82369 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.dto.screen;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.dto.screen.form.CategoryDictFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexGridScoreDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexGridScoreDTO.java
index ed068f9a75..7d909c672b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexGridScoreDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexGridScoreDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格相关分值
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java
index 9a1bc174c1..90906117bd 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 基层治理-治理能力排行数据(按月统计)
@@ -158,4 +158,4 @@ public class ScreenGovernRankDataDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectImgDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectImgDataDTO.java
index 42824beb62..919a528260 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectImgDataDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectImgDataDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.screen;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessAttachmentDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessAttachmentDTO.java
index 7655456484..72249fe141 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessAttachmentDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.screen;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessDTO.java
index e2479d607a..681facbafc 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectProcessDTO.java
@@ -17,14 +17,13 @@
 
 package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.epmet.dto.project.ProjectStaffDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/TreeResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/TreeResultDTO.java
index 9a40652c09..cc375a6f41 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/TreeResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/TreeResultDTO.java
@@ -1,11 +1,8 @@
 package com.epmet.dto.screen.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @Author zxc
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ScreenCollFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ScreenCollFormDTO.java
index 16ab5fee7d..f8a7b015f9 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ScreenCollFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ScreenCollFormDTO.java
@@ -6,7 +6,9 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.Valid;
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataListFormDTO.java
index a84a217b60..3252523125 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataListFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataListFormDTO.java
@@ -1,11 +1,8 @@
 package com.epmet.dto.screencoll.form;
 
-import com.epmet.dto.indexcollect.form.GridPartyAbilityFormDTO;
-import com.epmet.dto.screencoll.ImgDataListDTO;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataListFormDTO.java
index b8a6086721..6428d92b39 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataListFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataListFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.screencoll.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimAgencyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimAgencyDTO.java
index 8a8204cc54..091090381d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimAgencyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimAgencyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -68,7 +69,7 @@ public class DimAgencyDTO implements Serializable {
 乡（镇、街道）级:street,
 区县级: district,
 市级: city
-省级:province） 
+省级:province）
      */
 	private String level;
 
@@ -102,4 +103,4 @@ public class DimAgencyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimCustomerPartymemberDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimCustomerPartymemberDTO.java
index 8e1612fa8b..5deb54d63c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimCustomerPartymemberDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimCustomerPartymemberDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -49,7 +50,7 @@ public class DimCustomerPartymemberDTO implements Serializable {
 	private String gridId;
 
     /**
-     * 所属机关ID 
+     * 所属机关ID
      */
 	private String agencyId;
 
@@ -128,4 +129,4 @@ public class DimCustomerPartymemberDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDateDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDateDTO.java
index e539cda274..11aca64180 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDateDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDateDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -90,4 +91,4 @@ public class DimDateDTO implements Serializable {
 
 	private String monthId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDepartmentDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDepartmentDTO.java
index 80e89b4784..6ba42cd5a0 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDepartmentDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimDepartmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class DimDepartmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimGridDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimGridDTO.java
index 9b526935f0..14d874e10b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimGridDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimGridDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class DimGridDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimMonthDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimMonthDTO.java
index 40fa150485..b7906a6d2c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimMonthDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimMonthDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class DimMonthDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimQuarterDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimQuarterDTO.java
index b681ef2c15..b3ff7c73cb 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimQuarterDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimQuarterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class DimQuarterDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimTopicStatusDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimTopicStatusDTO.java
index bfd5b3a79f..bf0fa711c7 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimTopicStatusDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimTopicStatusDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -73,4 +74,4 @@ public class DimTopicStatusDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimWeekDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimWeekDTO.java
index 630c9834f2..ec468bd00d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimWeekDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimWeekDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class DimWeekDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimYearDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimYearDTO.java
index 5c3d213c6d..d92de5a9f7 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimYearDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/DimYearDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -73,4 +74,4 @@ public class DimYearDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java
index 89809107e2..6de2582618 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
@@ -184,4 +184,4 @@ public class FactAgencyOriginProjectDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java
index b35d5f30dc..eecae54a56 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
@@ -169,4 +169,4 @@ public class FactAgencyOriginProjectMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectDailyDTO.java
index 2a7e853f3a..56b7a618c3 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
@@ -179,4 +179,4 @@ public class FactAgencyProjectDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectMonthlyDTO.java
index 3c56190036..3414c1df51 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyProjectMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
@@ -169,4 +169,4 @@ public class FactAgencyProjectMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsDailyDTO.java
index 6beb42f54d..b65052845d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -188,4 +189,4 @@ public class FactGridMemberStatisticsDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsMonthlyDTO.java
index c5d1e237a7..ee76ea4707 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridMemberStatisticsMonthlyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -143,4 +144,4 @@ public class FactGridMemberStatisticsMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectDailyDTO.java
index e1962507f8..d233abfb81 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格下日项目数据统计表 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
@@ -179,4 +179,4 @@ public class FactGridProjectDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectMonthlyDTO.java
index 277e87e27e..55cc8060af 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGridProjectMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格下月项目数据统计表 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
@@ -169,4 +169,4 @@ public class FactGridProjectMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyDailyDTO.java
index a33b74dac2..75715a3724 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -153,4 +154,4 @@ public class FactGroupAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyMonthlyDTO.java
index 54b01164a4..d6820674fb 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupAgencyMonthlyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -143,4 +144,4 @@ public class FactGroupAgencyMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupGridDailyDTO.java
index 48503b3623..274bac7292 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupGridDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -153,4 +154,4 @@ public class FactGroupGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java
index d840d0510f..68005ac700 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class FactGroupTotalAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java
index 942888e0cb..52ddd3aec8 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class FactGroupTotalGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyDailyDTO.java
index b32a9d9b87..e920996cfb 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyDailyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 议题数量(按日) 
+ * 议题数量(按日)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
@@ -234,4 +234,4 @@ public class FactIssueAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyMonthlyDTO.java
index ea2b5cd11f..cbf44ba18c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueAgencyMonthlyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 组织机关议题数量(按月) 
+ * 组织机关议题数量(按月)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
@@ -224,4 +224,4 @@ public class FactIssueAgencyMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridDailyDTO.java
index c63ab13574..740d250645 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridDailyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 网格议题数量(按日) 
+ * 网格议题数量(按日)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
@@ -234,4 +234,4 @@ public class FactIssueGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridMonthlyDTO.java
index d79586998b..b1411a0a41 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactIssueGridMonthlyDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 网格议题数量(按月) 
+ * 网格议题数量(按月)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
@@ -224,4 +224,4 @@ public class FactIssueGridMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java
index 434775abd2..7092e57413 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 党员先锋-机关日统计数据
@@ -176,4 +176,4 @@ public class FactPartyMemberVanguardAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java
index 7d28a3e095..6f5f3de8f5 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 党员先锋-网格日统计数据
@@ -176,4 +176,4 @@ public class FactPartyMemberVanguardGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/CustomerIdAndDateIdFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/CustomerIdAndDateIdFormDTO.java
index e811c0aea0..bea4afab00 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/CustomerIdAndDateIdFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/CustomerIdAndDateIdFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.stats.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadDataFormDTO.java
index 576a4eb8a3..bd4969667c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadDataFormDTO.java
@@ -3,11 +3,8 @@ package com.epmet.dto.stats.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadEventFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadEventFormDTO.java
index d4ece8c8e5..f4c09104af 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadEventFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/form/GmUploadEventFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.stats.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.Date;
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java
index c5c5eeaa21..378b9b7448 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class FactTopicHotdiscussAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java
index 340f07dc49..ebfbda5bd7 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class FactTopicHotdiscussGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyDailyDTO.java
index b780a3e50c..33c8860633 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class FactTopicIssueAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyMonthlyDTO.java
index 6b3b99d300..ea335297e1 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueAgencyMonthlyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class FactTopicIssueAgencyMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridDailyDTO.java
index e006c7c688..6f0a69d7ae 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class FactTopicIssueGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridMonthlyDTO.java
index e2e373f485..dda45c713b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicIssueGridMonthlyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class FactTopicIssueGridMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyDailyDTO.java
index 82215ebd12..60f7da901d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.topic;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 状态话题-机关日统计数据表
@@ -134,4 +134,4 @@ public class FactTopicStatusAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyMonthlyDTO.java
index a89cdf966c..7573104194 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusAgencyMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.topic;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 状态话题-机关月统计数据表
@@ -83,7 +83,7 @@ public class FactTopicStatusAgencyMonthlyDTO implements Serializable {
 	private Integer topicCount;
 
     /**
-     * 话题状态占比 月末一天 
+     * 话题状态占比 月末一天
 指定状态话题数/话题总数
 总数在topic_total_agency_daily中
      */
@@ -124,4 +124,4 @@ public class FactTopicStatusAgencyMonthlyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusGridDailyDTO.java
index 72fa98eb49..6c023c17e3 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicStatusGridDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.topic;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 状态话题-网格日统计数据表
@@ -133,4 +133,4 @@ public class FactTopicStatusGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalAgencyDailyDTO.java
index fd06f45244..4f574e2fbf 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalAgencyDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class FactTopicTotalAgencyDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalGridDailyDTO.java
index 343feb0c92..2f9f8acdbf 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicTotalGridDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.stats.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class FactTopicTotalGridDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyDailyDTO.java
index 19d6f97b07..b0be67271a 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关下(按日)参与用户数分析
@@ -50,17 +50,17 @@ public class FactParticipationUserAgencyDailyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -144,4 +144,4 @@ public class FactParticipationUserAgencyDailyDTO implements Serializable {
      */
 	private String delFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyMonthlyDTO.java
index 72f772c956..288ae65f51 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserAgencyMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关下(按月)参与用户数分析
@@ -50,17 +50,17 @@ public class FactParticipationUserAgencyMonthlyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -144,4 +144,4 @@ public class FactParticipationUserAgencyMonthlyDTO implements Serializable {
      */
 	private String delFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridDailyDTO.java
index 2be14c087f..87bca73f00 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridDailyDTO.java
@@ -17,13 +17,12 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格下(按日)参与用户数分析
@@ -57,18 +56,18 @@ public class FactParticipationUserGridDailyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -164,4 +163,4 @@ public class FactParticipationUserGridDailyDTO implements Serializable {
         this.partymemberProportion = NumConstant.ZERO_DECIMAL;
         this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridMonthlyDTO.java
index be34873cf6..be6081f11e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactParticipationUserGridMonthlyDTO.java
@@ -17,13 +17,12 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格下(月)参与用户数分析
@@ -57,17 +56,17 @@ public class FactParticipationUserGridMonthlyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -163,4 +162,4 @@ public class FactParticipationUserGridMonthlyDTO implements Serializable {
         this.resiProportion = NumConstant.ZERO_DECIMAL;
         this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyDailyDTO.java
index b5c7ef980c..dbba2d6b1e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyDailyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关(按日)注册用户数分析
@@ -50,17 +50,17 @@ public class FactRegUserAgencyDailyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -144,4 +144,4 @@ public class FactRegUserAgencyDailyDTO implements Serializable {
      */
 	private String delFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyMonthlyDTO.java
index a97d7b4b7b..c0a31e2ad2 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserAgencyMonthlyDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 机关(按月)注册用户数分析
@@ -50,17 +50,17 @@ public class FactRegUserAgencyMonthlyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -144,4 +144,4 @@ public class FactRegUserAgencyMonthlyDTO implements Serializable {
      */
 	private String delFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridDailyDTO.java
index ea99e123f8..660612e9d3 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridDailyDTO.java
@@ -17,13 +17,12 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格(按日)注册用户数分析
@@ -57,17 +56,17 @@ public class FactRegUserGridDailyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -163,4 +162,4 @@ public class FactRegUserGridDailyDTO implements Serializable {
         this.partymemberProportion = NumConstant.ZERO_DECIMAL;
         this.warmHeartedProportion = NumConstant.ZERO_DECIMAL;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridMonthlyDTO.java
index 4060d75e7f..1c2ae8a4e8 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridMonthlyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/user/FactRegUserGridMonthlyDTO.java
@@ -17,13 +17,12 @@
 
 package com.epmet.dto.stats.user;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 网格(月)注册用户数分析
@@ -57,17 +56,17 @@ public class FactRegUserGridMonthlyDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
@@ -163,4 +162,4 @@ public class FactRegUserGridMonthlyDTO implements Serializable {
         this.resiProportion = NumConstant.ZERO_DECIMAL;
         this.partymemberProportion = NumConstant.ZERO_DECIMAL;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java
index f5f8d84596..c70b0332e4 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dto.user.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java
index cd77d2b25a..4bec6a8ec8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java
@@ -3,7 +3,10 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.DemandService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description 描述
@@ -17,12 +20,12 @@ public class DemandController {
 
     @Autowired
     private DemandService demandStatsService;
-    
+
     /**
      * wangxianzhang
-     * 
+     *
      * 计算客户下志愿者服务相关数据
-     * 
+     *
      * @param customerId 客户ID，可以为空，为空则计算所有客户
      * @return
      */
@@ -30,9 +33,9 @@ public class DemandController {
     public Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId) {
 
         demandStatsService.statsVolunteerDemandServicesDaily(customerId);
-        
+
         return new Result();
     }
-    
-    
+
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
index 3f9aa180a6..e689d255ae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
@@ -9,7 +9,6 @@ import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
 import com.epmet.service.StatsDimService;
 import com.epmet.service.stats.*;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -296,7 +295,7 @@ public class DimController {
         boolean syncAgencySuccess = true;
         boolean syncGridSuccess = true;
         boolean syncDepartmentSuccess = true;
-        
+
         // 一.同步agency
         try {
             statsDimService.syncCustomerAgencyDims(customerId);
@@ -326,7 +325,7 @@ public class DimController {
         r.put("syncAgencySuccess", syncAgencySuccess);
         r.put("syncGridSuccess", syncGridSuccess);
         r.put("syncDepartmentSuccess", syncDepartmentSuccess);
-        
+
         return new Result().ok(r);
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
index baa6fb21d2..03b9502564 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
@@ -2,7 +2,6 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java
index 6fffd887bc..dea03bd7a4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java
@@ -2,7 +2,6 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
-import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 import com.epmet.service.StatsTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
index 05ed692454..9f0d71205a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.AgencyScoreEntity;
-import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
index f4070ce8df..76ee3373c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
@@ -20,8 +20,8 @@ package com.epmet.dao.evaluationindex.indexcal;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.DeotScore;
-import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
 import com.epmet.dto.indexcal.DeptScoreDTO;
+import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index 51cb145080..3bd3cd9c8a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.project.result.ClosedProjectTotalResultDTO;
 import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -118,4 +117,4 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	List<ClosedProjectTotalResultDTO> selectClosedProjectTotal(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
 															   @Param("status")Boolean status);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/partymember/PartyMemberDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/partymember/PartyMemberDao.java
index 18b44ea8e0..d5bdb43819 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/partymember/PartyMemberDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/partymember/PartyMemberDao.java
@@ -1,15 +1,7 @@
 package com.epmet.dao.partymember;
 
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.extract.result.IssueInfoResultDTO;
-import com.epmet.dto.extract.result.IssueProcessInfoResultDTO;
-import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
-import com.epmet.dto.issue.IssueAgencyDTO;
-import com.epmet.dto.issue.IssueGridDTO;
-import com.epmet.dto.issue.IssueProjectDTO;
 import com.epmet.dto.party.PartyMemberDTO;
 import com.epmet.dto.stats.form.DimCustomerPartyMemberFormDTO;
-import com.epmet.entity.issue.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
index f153301c9a..9e0648a9d9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
@@ -31,7 +31,6 @@ import com.epmet.entity.project.ProjectProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-
 import java.util.List;
 
 /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java
index 66a80a58fe..e11ba2d776 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java
@@ -1,8 +1,5 @@
 package com.epmet.dao.stats;
 
-import com.epmet.dto.basereport.form.AgencyProjectFormDTO;
-import com.epmet.dto.basereport.form.AgencyRegUserFormDTO;
-import com.epmet.dto.basereport.form.GridRegUserFormDTO;
 import com.epmet.dto.basereport.form.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimAgencyDao.java
index 487bc79f97..7833b88e5d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimAgencyDao.java
@@ -27,7 +27,6 @@ import com.epmet.entity.stats.DimAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -145,4 +144,4 @@ public interface DimAgencyDao extends BaseDao<DimAgencyEntity> {
      * @return java.util.List<com.epmet.dto.stats.DimAgencyDTO>
      */
     List<DimAgencyDTO> selectDimAgencyByLevel(@Param("customerId")String customerId, @Param("level")String level);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java
index 5fd171160a..57b117d6fa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimDateDao.java
@@ -24,8 +24,6 @@ import com.epmet.entity.stats.DimDateEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 日期维度表
  *
@@ -43,4 +41,4 @@ public interface DimDateDao extends BaseDao<DimDateEntity> {
     int insertOne(DimDateEntity dimDateEntity);
 
     DimTimeResultDTO selectDimTime(@Param("dateId")String dateId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimTopicStatusDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimTopicStatusDao.java
index cbc26f7a33..17090876db 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimTopicStatusDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimTopicStatusDao.java
@@ -18,7 +18,6 @@
 package com.epmet.dao.stats;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-
 import com.epmet.entity.stats.DimTopicStatusEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,5 +29,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface DimTopicStatusDao extends BaseDao<DimTopicStatusEntity> {
-	
-}
\ No newline at end of file
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedDepartmentDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedDepartmentDailyDao.java
index dd48aa0afc..eff3feabec 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedDepartmentDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedDepartmentDailyDao.java
@@ -18,7 +18,6 @@
 package com.epmet.dao.stats;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.stats.FactArticlePublishedAgencyDailyDTO;
 import com.epmet.dto.stats.FactArticlePublishedDepartmentDailyDTO;
 import com.epmet.entity.stats.FactArticlePublishedDepartmentDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -52,4 +51,4 @@ public interface FactArticlePublishedDepartmentDailyDao extends BaseDao<FactArti
 	 * @return java.util.List<com.epmet.dto.stats.FactArticlePublishedAgencyDailyDTO>
 	 */
 	List<FactArticlePublishedDepartmentDailyDTO> selectDeptCount(@Param("customerId")String customerId, @Param("monthId")String monthId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupGridDailyDao.java
index c468f3a27c..a8557aa418 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupGridDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupGridDailyDao.java
@@ -25,7 +25,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 组-网格日统计数据
@@ -60,4 +59,4 @@ public interface FactGroupGridDailyDao extends BaseDao<FactGroupGridDailyEntity>
      * @date 2020.09.24 16:19
     **/
     List<ScreenUserTotalDataEntity> selectGroupCountByOrgLevel(@Param("orgLevel") String orgLevel, @Param("customerId") String customerId, @Param("dateId")String dateId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java
index acd5329dd4..431bc4921d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactParticipationUserGridDailyDao.java
@@ -20,7 +20,6 @@ package com.epmet.dao.stats.user;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.result.UserCountResultDTO;
 import com.epmet.dto.stats.user.FactParticipationUserGridDailyDTO;
-import com.epmet.entity.evaluationindex.screen.ScreenUserTotalDataEntity;
 import com.epmet.entity.stats.user.FactParticipationUserGridDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +46,4 @@ public interface FactParticipationUserGridDailyDao extends BaseDao<FactParticipa
      * @date 2020/9/23 9:57 上午
      */
     List<UserCountResultDTO> selectUserCount(@Param("customerId")String customerId,@Param("dateId")String dateId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java
index 4f37200359..738105a33c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java
@@ -7,13 +7,13 @@ package com.epmet.dao.topic;
  * @since v1.0.0 2020-05-11
  */
 
+import com.epmet.dto.extract.result.TopicInfoResultDTO;
 import com.epmet.dto.group.result.TopicContentResultDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.ScreenProjectImgDataDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.stats.topic.result.TopicListResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
-import com.epmet.dto.extract.result.TopicInfoResultDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.dto.topic.result.ResiGroupTopicResultDTO;
 import com.epmet.dto.topic.result.ResiTopicAndImgResultDTO;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectActionEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectActionEntity.java
index 2cf22199a9..728568bd65 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectActionEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectActionEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 对象行为动作维度表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectStatusEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectStatusEntity.java
index 121ff1a40e..01509ae7ee 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectStatusEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/DimObjectStatusEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 对象行为状态维度表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsDailyEntity.java
index 27ac16cb34..8e26fc91bf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 网格员数据统计_日统计
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsMonthlyEntity.java
index 86f5fa647c..cb251de3ad 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridMemberStatisticsMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 网格员数据统计_月统计
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java
index 34b01407d6..86312f03dc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 业务数据抽取-小组相关
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java
index 97317f5868..85468313ce 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-05-12
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueLogDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueLogDailyEntity.java
index 51f4e58c3a..5b26367a52 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueLogDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueLogDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  议题记录附表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueMainDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueMainDailyEntity.java
index a64aec4525..dc2d05a8c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueMainDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueMainDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  议题主表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectLogDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectLogDailyEntity.java
index a3110e0759..6e5d59e33d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectLogDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectLogDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目明细_日统计
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
index aa3f6e3ca2..34334cb1a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目主表_日统计
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectOrgPeriodDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectOrgPeriodDailyEntity.java
index b5f0d2d53b..0b99b4c331 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectOrgPeriodDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectOrgPeriodDailyEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,7 +45,7 @@ public class FactOriginProjectOrgPeriodDailyEntity extends BaseEpmetEntity {
 	private String projectId;
 
     /**
-     * 
+     *
      */
 	private String orgId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginTopicLogDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginTopicLogDailyEntity.java
index 83a6ec61ad..0cd873ecf9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginTopicLogDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginTopicLogDailyEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/DimLastSyncRecordEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/DimLastSyncRecordEntity.java
index d53db62b22..46e5b88532 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/DimLastSyncRecordEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/DimLastSyncRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-12-28
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java
index f8e3831864..e75d36927b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupDetailTemplateEntity.java
@@ -17,8 +17,6 @@
 
 package com.epmet.entity.evaluationindex.screen;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java
index 0db5a3da18..f8cdc843c5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexGroupTemplateEntity.java
@@ -17,8 +17,6 @@
 
 package com.epmet.entity.evaluationindex.screen;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnCommunityProjectProfileEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnCommunityProjectProfileEntity.java
index 8f6e954b8b..54aeeca279 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnCommunityProjectProfileEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnCommunityProjectProfileEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyEntity.java
index 3b738773e3..0ae25c5e30 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 安宁-基层治理-各类数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsOrgMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsOrgMonthlyEntity.java
index 889650f9b7..0af324eff7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsOrgMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsOrgMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 安宁-基层组织(党群数|议题数|项目数)-按月
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyEntity.java
index 9ec3bfdb20..0de1664818 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 安宁-基层党员-各类总数
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java
index 1cda08cfa7..77c940bb21 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-活动各类总数(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java
index 86c991a114..1cfe8ead13 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java
index 8247c51d97..540316a3ea 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-小组详情(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java
index 8f29a2829e..bf9656c6a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-小组分析各类总数(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java
index 2d22bf38b0..dfd9cda4cf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-议题分析(各类总数)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java
index 85f9cd9d2c..ed078f12cc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java
index 364a95575a..3c9b54523c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-新闻-按类别统计(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java
index 5b41cfbe2f..0d004ee376 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-热点新闻排行-(先根据customerId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java
index d344db9ad2..0156a82dbe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-新闻-各类总数(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java
index d63a96ee08..7fd80a6e69 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-新闻参与趋势-(先根据customerId+monthId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java
index 2f9c5343c8..1e9c943b44 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-平台各汇总值(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
index ba35584411..edf6120225 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java
index be5d16142e..16d5a6e4c9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java
index 85a387c49b..02058b0e9f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java
index 0f0a5b4e6c..ad6e27ea98 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-话题参与趋势(先根据customerId+monthId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java
index 6c47a97487..47bada3a83 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-用户分析(先根据customerId+dateId删除，后插入)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java
index 70b51169da..8bd93cfd69 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-用户趋势分析(根据monthId+customerId先删后增)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
index a681c2bca0..ff73d98610 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-志愿者公益时长排名(先根据customerId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java
index dc3f16f2c0..85bccbe65b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * KC-志愿者汇总(先根据customerId+dateId删除)
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
index 85b81560e2..780b420227 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectImgDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectImgDataEntity.java
index dba5258e51..e5f39056ff 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectImgDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectImgDataEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 中央区-项目数据图片
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessAttachmentEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessAttachmentEntity.java
index 41e9313679..1392e71895 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessAttachmentEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 中央区-项目数据处理节点附件表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessEntity.java
index e8b3fbb134..7df85a512b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectProcessEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java
index 60f41bd0fa..2ca5641728 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.heart;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 志愿者信息
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenBidInfoEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenBidInfoEntity.java
index c9d8658f10..2cb01cce66 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenBidInfoEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenBidInfoEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.plugins;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenContractInfoEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenContractInfoEntity.java
index 6d7d69ce3e..c6cfd069ed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenContractInfoEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenContractInfoEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.plugins;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenCustomerWorkRecordDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenCustomerWorkRecordDictEntity.java
index 067a349205..cf91687e37 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenCustomerWorkRecordDictEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenCustomerWorkRecordDictEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.plugins;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作日志资源字典表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java
index ef839eca62..ed5656abae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerPartymemberEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerPartymemberEntity.java
index 2c84bf98c4..290cb59621 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerPartymemberEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerPartymemberEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -49,7 +48,7 @@ public class DimCustomerPartymemberEntity extends BaseEpmetEntity {
 	private String gridId;
 
     /**
-     * 所属机关ID 
+     * 所属机关ID
      */
 	private String agencyId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDateEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDateEntity.java
index c6281eecca..e41e0db504 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDateEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDateEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDepartmentEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDepartmentEntity.java
index da22ff4fe7..9ac5bfe1d1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDepartmentEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimDepartmentEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
index 4db45eaef7..eac519a930 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
@@ -19,7 +19,6 @@ package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimMonthEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimMonthEntity.java
index d1d43f2b2c..cd1de2dd62 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimMonthEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimMonthEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimQuarterEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimQuarterEntity.java
index b0a4ef21f5..ed46438d20 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimQuarterEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimQuarterEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimTopicStatusEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimTopicStatusEntity.java
index 4bce308c22..fb1b8cf296 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimTopicStatusEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimTopicStatusEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimWeekEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimWeekEntity.java
index 2069e37477..01711692e2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimWeekEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimWeekEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java
index cb239df727..3be9766598 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java
index 2acda24617..181e6d5d4b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java
index baff107cf3..1f2765602b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java
index 7a9fc7c50a..167c7002e9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyProjectMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java
index e507f74500..c793720bb8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 网格下日项目数据统计表 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java
index 1ed377a64f..ff9713eeed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGridProjectMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 网格下月项目数据统计表 存放机关下截止到当前月份的各项总数据以及上月新增各项数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyDailyEntity.java
index e3ee31e7ec..819d38ecce 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 组-机关日统计数据
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyMonthlyEntity.java
index b7902589c7..97c14fde06 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupAgencyMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 组-机关月统计数据
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupGridDailyEntity.java
index 3c23206bc8..59cf411adf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 组-网格日统计数据
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java
index 814c9abd6a..f13097b980 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组总数-机关日统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java
index 995fe3fbb5..417795c17c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组总数-网格日统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyDailyEntity.java
index 377757ab2a..67d7d7328a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyDailyEntity.java
@@ -18,16 +18,14 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
- * 议题数量(按日) 
+ * 议题数量(按日)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyMonthlyEntity.java
index a06e51b59d..04f8232592 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueAgencyMonthlyEntity.java
@@ -18,16 +18,14 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
- * 组织机关议题数量(按月) 
+ * 组织机关议题数量(按月)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridDailyEntity.java
index 50d7d2ddaf..f534ce5d7d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridDailyEntity.java
@@ -18,16 +18,14 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
- * 网格议题数量(按日) 
+ * 网格议题数量(按日)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridMonthlyEntity.java
index 713d48f3f8..9d38a38645 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactIssueGridMonthlyEntity.java
@@ -18,16 +18,14 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
- * 网格议题数量(按月) 
+ * 网格议题数量(按月)
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java
index 44666ec1d9..74b11c8111 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 党员先锋-机关日统计数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java
index 5b591a8e7e..19cb5331c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 党员先锋-网格日统计数据
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java
index 4590334147..fd6b9fd001 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java
index 9b1fde9b74..1d4af7f186 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java
index 82687aeba0..f19ea2593b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 志愿者服务情况统计
  *
@@ -47,7 +44,7 @@ public class FactVolunteerServiceDailyEntity extends BaseEpmetEntity {
 	 * 网格ID
 	 */
 	private String gridId;
-	
+
     /**
      * yyyyMMdd
      */
@@ -87,9 +84,9 @@ public class FactVolunteerServiceDailyEntity extends BaseEpmetEntity {
      * 居民服务总次数
      */
 	private Integer resiServiceTotal;
-	
+
 	private String pid;
-	
+
 	private String pids;
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/LastExecRecordEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/LastExecRecordEntity.java
index 833954276d..6e02393927 100755
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/LastExecRecordEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/LastExecRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.stats;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyDailyEntity.java
index b8118c7dd1..ffb8e29b7b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 转议题话题-机关日统计数据表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyMonthlyEntity.java
index 5f782d0779..c21a0deab3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueAgencyMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 转议题话题-机关月统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridDailyEntity.java
index 90ecdb3b42..7791a74286 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 转议题话题-网格日统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridMonthlyEntity.java
index ff1a767364..767f801ae2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicIssueGridMonthlyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 转议题话题-网格月统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyDailyEntity.java
index a70533c5b8..94fe136cb2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 状态话题-机关日统计数据表
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyMonthlyEntity.java
index 41b867b6af..836205ca45 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusAgencyMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 状态话题-机关月统计数据表
@@ -83,7 +81,7 @@ public class FactTopicStatusAgencyMonthlyEntity extends BaseEpmetEntity {
 	private Integer topicCount;
 
     /**
-     * 话题状态占比 月末一天 
+     * 话题状态占比 月末一天
 指定状态话题数/话题总数
 总数在topic_total_agency_daily中
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusGridDailyEntity.java
index 9761626845..71ce9431b4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicStatusGridDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 状态话题-网格日统计数据表
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalAgencyDailyEntity.java
index 9ee374426f..f7ea8640a0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalAgencyDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题总数-机关日统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalGridDailyEntity.java
index f9976295ea..7b1d469049 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/topic/FactTopicTotalGridDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity.stats.topic;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题总数-网格日统计表
  *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyDailyEntity.java
index 512ff89b3e..da4109792b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关下(按日)参与用户数分析
@@ -50,17 +48,17 @@ public class FactParticipationUserAgencyDailyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyMonthlyEntity.java
index 7e261e70e0..171b292907 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserAgencyMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关下(按月)参与用户数分析
@@ -50,17 +48,17 @@ public class FactParticipationUserAgencyMonthlyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridDailyEntity.java
index 18f6b295f6..da04867819 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 网格下(按日)参与用户数分析
@@ -55,17 +53,17 @@ public class FactParticipationUserGridDailyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridMonthlyEntity.java
index 8fc4d93d16..2c0a04bce5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactParticipationUserGridMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 网格下(月)参与用户数分析
@@ -55,17 +53,17 @@ public class FactParticipationUserGridMonthlyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyDailyEntity.java
index aeffaeb3c5..3d60eb8d07 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关(按日)注册用户数分析
@@ -50,17 +48,17 @@ public class FactRegUserAgencyDailyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyMonthlyEntity.java
index daa07e392d..6045f6038b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserAgencyMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 机关(按月)注册用户数分析
@@ -50,17 +48,17 @@ public class FactRegUserAgencyMonthlyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridDailyEntity.java
index 17e41d1a65..fd333bbc9c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridDailyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 网格(按日)注册用户数分析
@@ -55,17 +53,17 @@ public class FactRegUserGridDailyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String dateId;
 
     /**
-     * 
+     *
      */
 	private String weekId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridMonthlyEntity.java
index 9030105ef1..6fc479c3d9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/user/FactRegUserGridMonthlyEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity.stats.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 网格(月)注册用户数分析
@@ -55,17 +53,17 @@ public class FactRegUserGridMonthlyEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String monthId;
 
     /**
-     * 
+     *
      */
 	private String quarterId;
 
     /**
-     * 
+     *
      */
 	private String yearId;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java
index 3340819a5b..23d38986f6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.user;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java
index 3efa67d17f..ba88d2e59c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity.voice;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
index 33ee4218e3..915e2003dd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -4,18 +4,9 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.enums.EnvEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 public class RocketMQConsumerRegister extends MQAbstractRegister {
 
@@ -25,4 +16,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
         register(consumerProperties, ConsomerGroupConstants.PROJECT_CHANGED_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectChangedCustomListener());
         // ...其他监听器类似
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
index c6019d1490..1fcb3da75b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
@@ -3,8 +3,6 @@ package com.epmet.service;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 
-import java.text.ParseException;
-
 /**
  * @Author zxc
  * @CreateTime 2020/6/16 14:14
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
index c4ba1d4fe2..a64c9f0d6c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
@@ -1,8 +1,6 @@
 package com.epmet.service;
 
 import com.epmet.dto.StatsFormDTO;
-import com.epmet.dto.group.form.GroupStatsFormDTO;
-import com.epmet.dto.group.form.GroupTotalFormDTO;
 
 /**
  * 党员先锋相关统计
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/ProjectExtractService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/ProjectExtractService.java
index 9b7b5e35fe..f71b757c83 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/ProjectExtractService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/ProjectExtractService.java
@@ -2,9 +2,6 @@ package com.epmet.service.evaluationindex.extract.todata;
 
 
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
-import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
-
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index d17225ca97..0115f781de 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -29,7 +29,10 @@ import com.epmet.dto.extract.FactGridGovernDailyDTO;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.dto.org.GridInfoDTO;
-import com.epmet.entity.evaluationindex.extract.*;
+import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridClosedTotalCommonDTO;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
+import com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
index e8ab17e4d1..bdbd028998 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
@@ -20,10 +20,10 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMemberDailyDao;
 import com.epmet.dto.extract.FactOriginGroupMemberDailyDTO;
@@ -31,7 +31,6 @@ import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMemberDailyService;
 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 org.springframework.util.CollectionUtils;
@@ -46,7 +45,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-05-12
@@ -142,4 +141,4 @@ public class FactOriginGroupMemberDailyServiceImpl extends BaseServiceImpl<FactO
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
index 93ab6289a0..47b23de1e9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
@@ -14,9 +14,9 @@ import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonth
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataDailyService;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java
index a7435b914e..fca60748d7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.ScreenConstant;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.service.evaluationindex.extract.toscreen.PartyBaseInfoService;
@@ -16,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import com.epmet.constant.ScreenConstant;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 1a40acf7aa..e56835cd05 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -20,7 +20,6 @@ import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dto.indexcal.*;
-import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity;
 import com.epmet.entity.evaluationindex.indexcal.AgencySubScoreEntity;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
index a249907314..f2879a3910 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
@@ -17,7 +17,6 @@
 
 package com.epmet.service.evaluationindex.screen;
 
-import cn.hutool.db.DaoTemplate;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
@@ -172,4 +171,4 @@ public interface ScreenCustomerAgencyService extends BaseService<ScreenCustomerA
      */
     Date getDimLastSyncTime();
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridAndOrgDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridAndOrgDailyService.java
index 9cdc9f3522..0185a98473 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridAndOrgDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridAndOrgDailyService.java
@@ -1,14 +1,5 @@
 package com.epmet.service.evaluationindex.screen;
 
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
-import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
-
-import java.util.List;
-import java.util.Map;
-
 /**
  * 项目(事件)分类按 网格——组织——按天统计
  */
@@ -31,4 +22,4 @@ public interface ScreenProjectCategoryGridAndOrgDailyService {
      * @date 2021/11/10 10:23 上午
      */
     void extractCategoryProjectOrgData(String customerId, String dateId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
index ca03285245..7d8b0c96a7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
@@ -31,7 +31,6 @@ import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDailyDao;
 import com.epmet.dto.screen.ScreenGovernRankDataDailyDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
-import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataDailyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -200,4 +199,4 @@ public class ScreenGovernRankDataDailyServiceImpl extends BaseServiceImpl<Screen
         this.insertBatch(ConvertUtils.sourceToTarget(list, ScreenGovernRankDataDailyEntity.class));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataServiceImpl.java
index 4679187995..1029bda744 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataServiceImpl.java
@@ -25,7 +25,6 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDao;
 import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
-import com.epmet.entity.evaluationindex.screen.ScreenPioneerDataEntity;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -84,4 +83,4 @@ public class ScreenGovernRankDataServiceImpl extends BaseServiceImpl<ScreenGover
 
 		insertBatch(entityList);
 	}
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectImgDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectImgDataServiceImpl.java
index cb1217f055..e353ab9006 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectImgDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectImgDataServiceImpl.java
@@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectImgDataDao;
 import com.epmet.dto.screen.ScreenProjectImgDataDTO;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java
index ec0377ab83..9005858181 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java
@@ -35,7 +35,6 @@ import com.epmet.dto.pingyin.result.ProjectTotalResultDTO;
 import com.epmet.dto.pingyin.result.ResolvedNumResultDTO;
 import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectOrgDailyEntity;
 import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.service.crm.CustomerRelationService;
@@ -52,7 +51,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -376,4 +374,4 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
             flag = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
         }while (flag > NumConstant.ZERO && flag == NumConstant.ONE_THOUSAND);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessAttachmentServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessAttachmentServiceImpl.java
index e750394f9b..66c506b9e2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessAttachmentServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessAttachmentServiceImpl.java
@@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectProcessAttachmentDao;
 import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java
index d18f3b6234..8ec66a9c34 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java
@@ -48,7 +48,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -389,4 +388,4 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java
index 8969b61d31..0fadcd0328 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java
@@ -1,13 +1,11 @@
 package com.epmet.service.heart.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.heart.IcUserDemandServiceDao;
 import com.epmet.dto.heart.result.DemandServiceCountResultDTO;
 import com.epmet.service.heart.HeartDemandService;
 import com.github.pagehelper.ISelect;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,10 +22,10 @@ import java.util.List;
 @Service
 @DataSource(DataSourceConstant.EPMET_HEART)
 public class HeartDemandServiceImpl implements HeartDemandService {
-    
+
     @Autowired
     private IcUserDemandServiceDao demandServiceDao;
-    
+
     @Override
     public List<DemandServiceCountResultDTO> listDemandServeTimesPage(String customerId, String gridId, Date endTime, int serviceCountPageNo, int serviceCountPageSize) {
         return PageHelper.startPage(serviceCountPageNo, serviceCountPageSize).doSelectPage(new ISelect() {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java
index 902a6a8713..e177380f53 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java
@@ -6,9 +6,6 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.heart.VolunteerInfoDao;
 import com.epmet.entity.heart.VolunteerInfoEntity;
 import com.epmet.service.heart.HeartVolunteerService;
-import com.github.pagehelper.ISelect;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,10 +21,10 @@ import java.util.List;
 @Service
 @DataSource(DataSourceConstant.EPMET_HEART)
 public class HeartVolunteerServiceImpl implements HeartVolunteerService {
-    
+
     @Autowired
     private VolunteerInfoDao volunteerInfoDao;
-    
+
     @Override
     public List<VolunteerInfoEntity> listVolunteers(String customerId, Date endCreateTime) {
         LambdaQueryWrapper<VolunteerInfoEntity> query = new LambdaQueryWrapper<>();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
index 47cb0e6d2a..37ca20123f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
@@ -16,7 +16,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
@@ -110,7 +113,7 @@ public class EIDimServiceImpl implements EIDimService {
         //if (lastAddDept != null) {
         //    startTime = lastAddDept.getCreatedTime();
         //}
-        
+
         Date startTime = screenCustomerDeptService.getLastSyncEndTime();
         return originCustomerDepartmentService.listDepartmentsByCreatedTime(null, startTime, syncEndTime);
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/GovernanceDataReportServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/GovernanceDataReportServiceImpl.java
index 7d54242058..12a7264f1c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/GovernanceDataReportServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/GovernanceDataReportServiceImpl.java
@@ -2,11 +2,9 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dto.extract.form.AgencyGovernDailyFormDTO;
 import com.epmet.dto.extract.form.GridGovernDailyFormDTO;
 import com.epmet.dto.screencoll.form.GovernRankDataDailyFormDTO;
-import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
 import com.epmet.service.GovernanceDataReportService;
 import com.epmet.service.evaluationindex.extract.todata.FactAgencyGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
index 74e0c8615b..5c449a051e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
@@ -11,8 +11,9 @@ import com.epmet.dto.stats.DimTopicStatusDTO;
 import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 import com.epmet.dto.stats.topic.result.TopicListResultDTO;
 import com.epmet.dto.stats.topic.result.TopicStatisticalData;
-import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
-import com.epmet.entity.stats.*;
+import com.epmet.entity.stats.DimGridEntity;
+import com.epmet.entity.stats.FactTopicHotdiscussAgencyDailyEntity;
+import com.epmet.entity.stats.FactTopicHotdiscussGridDailyEntity;
 import com.epmet.service.StatsTopicService;
 import com.epmet.service.stats.*;
 import com.epmet.service.stats.topic.TopicStatisticalService;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
index 0dd3fd62a9..13f641fa98 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
@@ -12,7 +12,6 @@ import com.epmet.dto.stats.DimGridDTO;
 import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.entity.org.CustomerGridEntity;
-import com.epmet.entity.stats.DimGridEntity;
 
 import java.util.Date;
 import java.util.List;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
index 47e8ead12d..7c097b1302 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
@@ -25,7 +25,6 @@ import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.entity.stats.DimAgencyEntity;
 
-import javax.xml.soap.SAAJResult;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -208,4 +207,4 @@ public interface DimAgencyService extends BaseService<DimAgencyEntity> {
      * @param initTime
      */
     void initAgencySelfDim(CustomerAgencyEntity agency, Date initTime);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerService.java
index 5a02299b44..7a806ca909 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerService.java
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.DimCustomerDTO;
 import com.epmet.entity.crm.CustomerEntity;
-import com.epmet.entity.org.CustomerDepartmentEntity;
 import com.epmet.entity.stats.DimCustomerEntity;
 
 import java.util.Date;
@@ -123,4 +122,4 @@ public interface DimCustomerService extends BaseService<DimCustomerEntity> {
      * @date 2020/9/17 3:30 下午
      */
     List<String> getAllCustomerId();
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
index 3702b09ceb..2c5409fb19 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
@@ -26,7 +26,6 @@ import com.epmet.dto.stats.DimGridDTO;
 import com.epmet.dto.stats.result.GridAttributesResultDTO;
 import com.epmet.dto.stats.result.GridBelongAgencyResultDTO;
 import com.epmet.entity.stats.DimGridEntity;
-import com.epmet.entity.stats.LastExecRecordEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -156,4 +155,4 @@ public interface DimGridService extends BaseService<DimGridEntity> {
      */
     List<String> listGridIds(String customerId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyMonthlyService.java
index 75e43242c7..dec2272143 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyMonthlyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
 import com.epmet.dto.stats.FactGroupAgencyMonthlyDTO;
 import com.epmet.entity.stats.FactGroupAgencyMonthlyEntity;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -101,4 +100,4 @@ public interface FactGroupAgencyMonthlyService extends BaseService<FactGroupAgen
      * @author zxc
      */
     void insertAgencyGroupMonthly(List<AgencyMonthlyFormDTO> agencyMonth);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTagUsedAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTagUsedAgencyDailyService.java
index da57ca03b9..71a7449b59 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTagUsedAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTagUsedAgencyDailyService.java
@@ -19,7 +19,6 @@ package com.epmet.service.stats;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.stats.FactTagUsedAgencyDailyEntity;
-import com.epmet.entity.stats.FactTagUsedGridDailyEntity;
 
 import java.util.Collection;
 import java.util.List;
@@ -47,4 +46,4 @@ public interface FactTagUsedAgencyDailyService extends BaseService<FactTagUsedAg
 	 * @return
 	 */
 	List<FactTagUsedAgencyDailyEntity> getTagUsedCountByMonth(String customerId, String monthId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java
index 54a8525877..eb03694e43 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.epmet.service.stats.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactVolunteerServiceDailyDao;
@@ -20,10 +19,10 @@ import java.util.List;
 @Service
 @DataSource(DataSourceConstant.STATS)
 public class DemandStatsServiceImpl implements DemandStatsService {
-    
+
     @Autowired
     private FactVolunteerServiceDailyDao factVolunteerServiceDailyDao;
-    
+
     @Override
     public void addVolunteerServiceDaily(FactVolunteerServiceDailyEntity entity) {
         factVolunteerServiceDailyDao.insert(entity);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
index 940a77d134..d1ba22b884 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
@@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.form.TimeListResultDTO;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.StatsConstant;
@@ -258,4 +258,4 @@ public class DimCustomerPartymemberServiceImpl extends BaseServiceImpl<DimCustom
     public List<PartyMemberInfoResultDTO> selectPartyMemberInfoByCustomerId(String customerId) {
         return baseDao.selectPartyMemberInfoByCustomerId(customerId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
index 5de49ca847..9ff2671fbb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
@@ -43,9 +43,11 @@ 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 org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -201,8 +203,8 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
         LambdaQueryWrapper<DimGridEntity> query = new LambdaQueryWrapper<>();
         query.eq(DimGridEntity::getCustomerId, customerId);
         query.select(DimGridEntity::getId);
-        
+
         return baseDao.selectObjs(query).stream().map(o -> o.toString()).collect(Collectors.toList());
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java
index 13a15d27f4..5c21a00ee1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java
@@ -20,16 +20,15 @@ package com.epmet.service.stats.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.DimTopicStatusDao;
 import com.epmet.dto.stats.DimTopicStatusDTO;
 import com.epmet.entity.stats.DimTopicStatusEntity;
 import com.epmet.service.stats.DimTopicStatusService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java
index ef08dc5cbf..ee785993a5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.FactAgencyOriginProjectDailyDao;
 import com.epmet.dto.stats.FactAgencyOriginProjectDailyDTO;
 import com.epmet.entity.stats.FactAgencyOriginProjectDailyEntity;
 import com.epmet.service.stats.FactAgencyOriginProjectDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -98,4 +97,4 @@ public class FactAgencyOriginProjectDailyServiceImpl extends BaseServiceImpl<Fac
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java
index 55a965b5d3..9960178cc0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.FactAgencyOriginProjectMonthlyDao;
 import com.epmet.dto.stats.FactAgencyOriginProjectMonthlyDTO;
 import com.epmet.entity.stats.FactAgencyOriginProjectMonthlyEntity;
 import com.epmet.service.stats.FactAgencyOriginProjectMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -98,4 +97,4 @@ public class FactAgencyOriginProjectMonthlyServiceImpl extends BaseServiceImpl<F
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
index 3d32581b86..10fd8db1dc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
@@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.FactPartyMemberVanguardAgencyDailyDao;
 import com.epmet.dto.stats.FactPartyMemberVanguardAgencyDailyDTO;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyDailyService.java
index c1246dfb38..9a1a38e86a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicIssueAgencyDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueAgencyDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicIssueAgencyDailyService extends BaseService<FactTopicI
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyMonthlyService.java
index 0d4a48ea5a..9de5e2ea68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueAgencyMonthlyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicIssueAgencyMonthlyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueAgencyMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicIssueAgencyMonthlyService extends BaseService<FactTopi
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridDailyService.java
index 12e23274a8..e497da04bc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicIssueGridDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueGridDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicIssueGridDailyService extends BaseService<FactTopicIss
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridMonthlyService.java
index 3101304a62..ca7b9fe71f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicIssueGridMonthlyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicIssueGridMonthlyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueGridMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicIssueGridMonthlyService extends BaseService<FactTopicI
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyDailyService.java
index b653a4fee7..e349e47d29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicStatusAgencyDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicStatusAgencyDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicStatusAgencyDailyService extends BaseService<FactTopic
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyMonthlyService.java
index 55c0b5adf3..bc7d8c32a8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusAgencyMonthlyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicStatusAgencyMonthlyDTO;
 import com.epmet.entity.stats.topic.FactTopicStatusAgencyMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicStatusAgencyMonthlyService extends BaseService<FactTop
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusGridDailyService.java
index 8a76bb9707..f51ed25a5c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusGridDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicStatusGridDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicStatusGridDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicStatusGridDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicStatusGridDailyService extends BaseService<FactTopicSt
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalAgencyDailyService.java
index 4a5800f3fc..3af45a0837 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalAgencyDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicTotalAgencyDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicTotalAgencyDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicTotalAgencyDailyService extends BaseService<FactTopicT
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalGridDailyService.java
index c4fc1cd71e..7ec4cd2a98 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalGridDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/FactTopicTotalGridDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.topic.FactTopicTotalGridDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicTotalGridDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactTopicTotalGridDailyService extends BaseService<FactTopicTot
      * @date 2020-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyDailyServiceImpl.java
index 614e95486e..f292fd393a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicIssueAgencyDailyDao;
 import com.epmet.dto.stats.topic.FactTopicIssueAgencyDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueAgencyDailyEntity;
 import com.epmet.service.stats.topic.FactTopicIssueAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicIssueAgencyDailyServiceImpl extends BaseServiceImpl<FactTopicIssueAgencyDailyDao, FactTopicIssueAgencyDailyEntity> implements FactTopicIssueAgencyDailyService {
 
-   
+
 
     @Override
     public PageData<FactTopicIssueAgencyDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicIssueAgencyDailyServiceImpl extends BaseServiceImpl<FactTo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyMonthlyServiceImpl.java
index 5e7e0c6d2a..d49394518b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueAgencyMonthlyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicIssueAgencyMonthlyDao;
 import com.epmet.dto.stats.topic.FactTopicIssueAgencyMonthlyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueAgencyMonthlyEntity;
 import com.epmet.service.stats.topic.FactTopicIssueAgencyMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicIssueAgencyMonthlyServiceImpl extends BaseServiceImpl<FactTopicIssueAgencyMonthlyDao, FactTopicIssueAgencyMonthlyEntity> implements FactTopicIssueAgencyMonthlyService {
 
-    
+
 
     @Override
     public PageData<FactTopicIssueAgencyMonthlyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicIssueAgencyMonthlyServiceImpl extends BaseServiceImpl<Fact
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridDailyServiceImpl.java
index 5d9e805fb8..44905ef446 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicIssueGridDailyDao;
 import com.epmet.dto.stats.topic.FactTopicIssueGridDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueGridDailyEntity;
 import com.epmet.service.stats.topic.FactTopicIssueGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicIssueGridDailyServiceImpl extends BaseServiceImpl<FactTopicIssueGridDailyDao, FactTopicIssueGridDailyEntity> implements FactTopicIssueGridDailyService {
 
-  
+
 
     @Override
     public PageData<FactTopicIssueGridDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicIssueGridDailyServiceImpl extends BaseServiceImpl<FactTopi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridMonthlyServiceImpl.java
index 9f3004f690..070a5b4d12 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicIssueGridMonthlyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicIssueGridMonthlyDao;
 import com.epmet.dto.stats.topic.FactTopicIssueGridMonthlyDTO;
 import com.epmet.entity.stats.topic.FactTopicIssueGridMonthlyEntity;
 import com.epmet.service.stats.topic.FactTopicIssueGridMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicIssueGridMonthlyServiceImpl extends BaseServiceImpl<FactTopicIssueGridMonthlyDao, FactTopicIssueGridMonthlyEntity> implements FactTopicIssueGridMonthlyService {
 
-   
+
 
     @Override
     public PageData<FactTopicIssueGridMonthlyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicIssueGridMonthlyServiceImpl extends BaseServiceImpl<FactTo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyDailyServiceImpl.java
index d6644f4c26..47de48af99 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicStatusAgencyDailyDao;
 import com.epmet.dto.stats.topic.FactTopicStatusAgencyDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicStatusAgencyDailyEntity;
 import com.epmet.service.stats.topic.FactTopicStatusAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicStatusAgencyDailyServiceImpl extends BaseServiceImpl<FactTopicStatusAgencyDailyDao, FactTopicStatusAgencyDailyEntity> implements FactTopicStatusAgencyDailyService {
 
-    
+
 
     @Override
     public PageData<FactTopicStatusAgencyDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicStatusAgencyDailyServiceImpl extends BaseServiceImpl<FactT
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyMonthlyServiceImpl.java
index 86c88ed82b..9c961adb55 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusAgencyMonthlyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicStatusAgencyMonthlyDao;
 import com.epmet.dto.stats.topic.FactTopicStatusAgencyMonthlyDTO;
 import com.epmet.entity.stats.topic.FactTopicStatusAgencyMonthlyEntity;
 import com.epmet.service.stats.topic.FactTopicStatusAgencyMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicStatusAgencyMonthlyServiceImpl extends BaseServiceImpl<FactTopicStatusAgencyMonthlyDao, FactTopicStatusAgencyMonthlyEntity> implements FactTopicStatusAgencyMonthlyService {
 
- 
+
 
     @Override
     public PageData<FactTopicStatusAgencyMonthlyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicStatusAgencyMonthlyServiceImpl extends BaseServiceImpl<Fac
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusGridDailyServiceImpl.java
index af4e77a184..ec2da00156 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicStatusGridDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicStatusGridDailyDao;
 import com.epmet.dto.stats.topic.FactTopicStatusGridDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicStatusGridDailyEntity;
 import com.epmet.service.stats.topic.FactTopicStatusGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicStatusGridDailyServiceImpl extends BaseServiceImpl<FactTopicStatusGridDailyDao, FactTopicStatusGridDailyEntity> implements FactTopicStatusGridDailyService {
 
-    
+
 
     @Override
     public PageData<FactTopicStatusGridDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicStatusGridDailyServiceImpl extends BaseServiceImpl<FactTop
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalAgencyDailyServiceImpl.java
index 351a6f2e29..413fd2b50b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalAgencyDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicTotalAgencyDailyDao;
 import com.epmet.dto.stats.topic.FactTopicTotalAgencyDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicTotalAgencyDailyEntity;
 import com.epmet.service.stats.topic.FactTopicTotalAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicTotalAgencyDailyServiceImpl extends BaseServiceImpl<FactTopicTotalAgencyDailyDao, FactTopicTotalAgencyDailyEntity> implements FactTopicTotalAgencyDailyService {
 
-   
+
 
     @Override
     public PageData<FactTopicTotalAgencyDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicTotalAgencyDailyServiceImpl extends BaseServiceImpl<FactTo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalGridDailyServiceImpl.java
index 53316ce9bb..e9db20ef8b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/FactTopicTotalGridDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.topic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.topic.FactTopicTotalGridDailyDao;
 import com.epmet.dto.stats.topic.FactTopicTotalGridDailyDTO;
 import com.epmet.entity.stats.topic.FactTopicTotalGridDailyEntity;
 import com.epmet.service.stats.topic.FactTopicTotalGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactTopicTotalGridDailyServiceImpl extends BaseServiceImpl<FactTopicTotalGridDailyDao, FactTopicTotalGridDailyEntity> implements FactTopicTotalGridDailyService {
 
-    
+
 
     @Override
     public PageData<FactTopicTotalGridDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactTopicTotalGridDailyServiceImpl extends BaseServiceImpl<FactTopi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyDailyService.java
index 22923f3b3a..ef932f2e1e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyDailyService.java
@@ -23,7 +23,6 @@ import com.epmet.dto.extract.result.UserCountResultDTO;
 import com.epmet.dto.stats.user.FactParticipationUserAgencyDailyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserAgencyDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -103,4 +102,4 @@ public interface FactParticipationUserAgencyDailyService extends BaseService<Fac
      * @date 2020/9/23 9:57 上午
      */
     List<UserCountResultDTO> selectUserCount(String customerId, String dateId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyMonthlyService.java
index 913b9140f4..f430333db7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserAgencyMonthlyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.user.FactParticipationUserAgencyMonthlyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserAgencyMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactParticipationUserAgencyMonthlyService extends BaseService<F
      * @date 2020-06-17
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java
index 0f3ab1e3af..79f60a3aa6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridDailyService.java
@@ -23,7 +23,6 @@ import com.epmet.dto.extract.result.UserCountResultDTO;
 import com.epmet.dto.stats.user.FactParticipationUserGridDailyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserGridDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -102,4 +101,4 @@ public interface FactParticipationUserGridDailyService extends BaseService<FactP
      * @date 2020/9/23 9:57 上午
      */
     List<UserCountResultDTO> selectUserCount(String customerId,String dateId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridMonthlyService.java
index 729f51a276..11d569e8e7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactParticipationUserGridMonthlyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.user.FactParticipationUserGridMonthlyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserGridMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactParticipationUserGridMonthlyService extends BaseService<Fac
      * @date 2020-06-17
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserAgencyDailyService.java
index 4b83259245..777d59be41 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserAgencyDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserAgencyDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.user.FactRegUserAgencyDailyDTO;
 import com.epmet.entity.stats.user.FactRegUserAgencyDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactRegUserAgencyDailyService extends BaseService<FactRegUserAg
      * @date 2020-06-17
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridDailyService.java
index b3ed088fb3..8d56ec4312 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridDailyService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.user.FactRegUserGridDailyDTO;
 import com.epmet.entity.stats.user.FactRegUserGridDailyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface FactRegUserGridDailyService extends BaseService<FactRegUserGrid
      * @date 2020-06-17
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java
index 548c714629..ddbb2fa4ed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java
@@ -23,7 +23,6 @@ import com.epmet.dto.extract.result.GridUserCountResultDTO;
 import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO;
 import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -124,4 +123,4 @@ public interface FactRegUserGridMonthlyService extends BaseService<FactRegUserGr
      * @return java.util.List<com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO>
      */
     List<FactRegUserGridMonthlyDTO> getGridUserCountByCustomer(String customerId, String monthId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyDailyServiceImpl.java
index 6ad42a15fc..df034d4dc2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyDailyServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactParticipationUserAgencyDailyDao;
 import com.epmet.dto.extract.result.UserCountResultDTO;
 import com.epmet.dto.stats.user.FactParticipationUserAgencyDailyDTO;
@@ -45,7 +45,7 @@ import java.util.Map;
 @Service
 public class FactParticipationUserAgencyDailyServiceImpl extends BaseServiceImpl<FactParticipationUserAgencyDailyDao, FactParticipationUserAgencyDailyEntity> implements FactParticipationUserAgencyDailyService {
 
-    
+
 
     @Override
     public PageData<FactParticipationUserAgencyDailyDTO> page(Map<String, Object> params) {
@@ -111,4 +111,4 @@ public class FactParticipationUserAgencyDailyServiceImpl extends BaseServiceImpl
         return baseDao.selectUserCount(customerId, dateId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyMonthlyServiceImpl.java
index f9b7ac4b0c..f8843a87b3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserAgencyMonthlyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactParticipationUserAgencyMonthlyDao;
 import com.epmet.dto.stats.user.FactParticipationUserAgencyMonthlyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserAgencyMonthlyEntity;
 import com.epmet.service.stats.user.FactParticipationUserAgencyMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactParticipationUserAgencyMonthlyServiceImpl extends BaseServiceImpl<FactParticipationUserAgencyMonthlyDao, FactParticipationUserAgencyMonthlyEntity> implements FactParticipationUserAgencyMonthlyService {
 
-   
+
 
     @Override
     public PageData<FactParticipationUserAgencyMonthlyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactParticipationUserAgencyMonthlyServiceImpl extends BaseServiceIm
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java
index 30516acafa..e3d4782a58 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridDailyServiceImpl.java
@@ -20,16 +20,15 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactParticipationUserGridDailyDao;
 import com.epmet.dto.extract.result.UserCountResultDTO;
 import com.epmet.dto.stats.user.FactParticipationUserGridDailyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserGridDailyEntity;
 import com.epmet.service.stats.user.FactParticipationUserGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,7 +45,7 @@ import java.util.Map;
 @Service
 public class FactParticipationUserGridDailyServiceImpl extends BaseServiceImpl<FactParticipationUserGridDailyDao, FactParticipationUserGridDailyEntity> implements FactParticipationUserGridDailyService {
 
-    
+
 
     @Override
     public PageData<FactParticipationUserGridDailyDTO> page(Map<String, Object> params) {
@@ -111,4 +110,4 @@ public class FactParticipationUserGridDailyServiceImpl extends BaseServiceImpl<F
         return baseDao.selectUserCount(customerId,dateId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridMonthlyServiceImpl.java
index e6068acf90..eba456b0e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactParticipationUserGridMonthlyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactParticipationUserGridMonthlyDao;
 import com.epmet.dto.stats.user.FactParticipationUserGridMonthlyDTO;
 import com.epmet.entity.stats.user.FactParticipationUserGridMonthlyEntity;
 import com.epmet.service.stats.user.FactParticipationUserGridMonthlyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactParticipationUserGridMonthlyServiceImpl extends BaseServiceImpl<FactParticipationUserGridMonthlyDao, FactParticipationUserGridMonthlyEntity> implements FactParticipationUserGridMonthlyService {
 
-   
+
 
     @Override
     public PageData<FactParticipationUserGridMonthlyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactParticipationUserGridMonthlyServiceImpl extends BaseServiceImpl
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserAgencyDailyServiceImpl.java
index c97a763f61..afd41947eb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserAgencyDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserAgencyDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactRegUserAgencyDailyDao;
 import com.epmet.dto.stats.user.FactRegUserAgencyDailyDTO;
 import com.epmet.entity.stats.user.FactRegUserAgencyDailyEntity;
 import com.epmet.service.stats.user.FactRegUserAgencyDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactRegUserAgencyDailyServiceImpl extends BaseServiceImpl<FactRegUserAgencyDailyDao, FactRegUserAgencyDailyEntity> implements FactRegUserAgencyDailyService {
 
-    
+
 
     @Override
     public PageData<FactRegUserAgencyDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactRegUserAgencyDailyServiceImpl extends BaseServiceImpl<FactRegUs
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridDailyServiceImpl.java
index 8aba7fbcd5..77617bd647 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridDailyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.stats.user.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.user.FactRegUserGridDailyDao;
 import com.epmet.dto.stats.user.FactRegUserGridDailyDTO;
 import com.epmet.entity.stats.user.FactRegUserGridDailyEntity;
 import com.epmet.service.stats.user.FactRegUserGridDailyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +44,7 @@ import java.util.Map;
 @Service
 public class FactRegUserGridDailyServiceImpl extends BaseServiceImpl<FactRegUserGridDailyDao, FactRegUserGridDailyEntity> implements FactRegUserGridDailyService {
 
-    
+
 
     @Override
     public PageData<FactRegUserGridDailyDTO> page(Map<String, Object> params) {
@@ -99,4 +98,4 @@ public class FactRegUserGridDailyServiceImpl extends BaseServiceImpl<FactRegUser
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexOutputVO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexOutputVO.java
index fdf0a3dea9..c1bb853ca7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexOutputVO.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexOutputVO.java
@@ -3,7 +3,6 @@ package com.epmet.support.normalizing.batch;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 @Data
diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/RedissonTest.java b/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/RedissonTest.java
index 9df96f6d70..9baa4df548 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/RedissonTest.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/RedissonTest.java
@@ -1,6 +1,5 @@
 package com.epmet.stats.test;
 
-import com.alibaba.fastjson.JSON;
 import com.epmet.DataStatsApplication;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.distributedlock.LockConstants;
@@ -17,7 +16,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 /**
  * desc：redisson测试类
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActModelController.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActModelController.java
index b7f56f68a7..edd8ee879b 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActModelController.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActModelController.java
@@ -8,13 +8,11 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.ModelDTO;
 import com.epmet.service.ActModelService;
-
 import org.activiti.engine.repository.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActProcessController.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActProcessController.java
index 04df1e7b30..29ef50aaff 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActProcessController.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActProcessController.java
@@ -8,7 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActRunningController.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActRunningController.java
index cb1b3ac250..1c95409d63 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActRunningController.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/controller/ActRunningController.java
@@ -15,6 +15,7 @@ import com.epmet.dto.ProcessStartDTO;
 import com.epmet.service.ActRunningService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Map;
 
 /**
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/editor/model/ModelSaveRestResource.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/editor/model/ModelSaveRestResource.java
index 1aec11c2c6..39dcad7422 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/editor/model/ModelSaveRestResource.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/editor/model/ModelSaveRestResource.java
@@ -8,9 +8,9 @@
 
 package com.epmet.editor.model;
 
+import com.epmet.commons.tools.xss.XssHttpServletRequestWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.epmet.commons.tools.xss.XssHttpServletRequestWrapper;
 import org.activiti.editor.constants.ModelDataJsonConstants;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.RepositoryService;
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActModelService.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActModelService.java
index 9b54236b96..e83f43b073 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActModelService.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActModelService.java
@@ -8,13 +8,13 @@
 
 package com.epmet.service;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.exception.ModuleErrorCode;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.BpmnModel;
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActProcessService.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActProcessService.java
index 3eb2ed9f64..84cf83650e 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActProcessService.java
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/service/ActProcessService.java
@@ -8,12 +8,12 @@
 
 package com.epmet.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.exception.ModuleErrorCode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.editor.constants.ModelDataJsonConstants;
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java
index 4666bc9883..920d48f56b 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/AreaCodeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class AreaCodeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
index 220ec8ef12..62c1889cf8 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
@@ -17,16 +17,16 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
+import java.io.Serializable;
+import java.util.Date;
+
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-05-11
@@ -134,4 +134,4 @@ public class CalenderDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java
index eb9a658257..dbc85f1ed3 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AreaCodeDictResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ExternalCustomerResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ExternalCustomerResultDTO.java
index 177b49575b..3e33631d00 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ExternalCustomerResultDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ExternalCustomerResultDTO.java
@@ -17,13 +17,13 @@
 
 package com.epmet.dto.result;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
+
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-19
@@ -43,4 +43,4 @@ public class ExternalCustomerResultDTO implements Serializable {
      */
 	private String customerName;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java
index 8c594b1298..33b3e866cb 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.result;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeChildController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeChildController.java
index 9925428237..988030eaff 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeChildController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeChildController.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.AreaCodeChildDTO;
 import com.epmet.service.AreaCodeChildService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("areacodechild")
 public class AreaCodeChildController {
-    
+
     @Autowired
     private AreaCodeChildService areaCodeChildService;
 
@@ -81,4 +81,4 @@ public class AreaCodeChildController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
index 80d0062bec..32a3b08698 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CalenderDTO;
 import com.epmet.dto.form.CalenderFormDTO;
 import com.epmet.service.CalenderService;
@@ -34,7 +34,7 @@ import java.util.Map;
 
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-05-11
@@ -42,7 +42,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("calender")
 public class CalenderController {
-    
+
     @Autowired
     private CalenderService calenderService;
 
@@ -83,4 +83,4 @@ public class CalenderController {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
index c0cacc525d..b425cd9120 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
@@ -20,7 +20,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
index abfd449ef3..bf5143ab55 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
@@ -3,8 +3,8 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.CostDayFormDTO;
 import com.epmet.dto.form.WorkDayFormDTO;
-import com.epmet.dto.result.CostDayResultDTO;
 import com.epmet.dto.form.WorkMinuteFormDTO;
+import com.epmet.dto.result.CostDayResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.service.WorkDayService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppSecretDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppSecretDao.java
index 7faeae8ed4..c90b05a65f 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppSecretDao.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppSecretDao.java
@@ -22,8 +22,6 @@ import com.epmet.entity.ExternalAppSecretEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 外部应用秘钥列表
  *
@@ -43,4 +41,4 @@ public interface ExternalAppSecretDao extends BaseDao<ExternalAppSecretEntity> {
     int updateSecret(@Param("appId") String appId, @Param("secret") String secret);
 
     String getSecretByAppId(String appId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeChildEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeChildEntity.java
index 071cb5856f..4cc55b4745 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeChildEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeChildEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * (4-5)街道/城镇和社区/村地区code
  *
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeEntity.java
index 5e44df06ae..4a4dd34ca0 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/AreaCodeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 大陆省市区地区码
  *
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java
index 831b102b38..6e86205f9e 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-05-11
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppEntity.java
index 421e9712f5..4651cfa4e2 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 外部应用列表
  *
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppSecretEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppSecretEntity.java
index 0977e12264..d60c625cf6 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppSecretEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppSecretEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 外部应用秘钥列表
  *
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalCustomerEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalCustomerEntity.java
index fccfbbb6a1..e7cc37039e 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalCustomerEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalCustomerEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-19
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/HelperVideoEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/HelperVideoEntity.java
index d94043acec..ec380d2ea8 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/HelperVideoEntity.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/HelperVideoEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalCustomerService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalCustomerService.java
index 25645bea0b..ed70fa3ac6 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalCustomerService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalCustomerService.java
@@ -2,7 +2,6 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.result.ExternalCustomerResultDTO;
-import com.epmet.entity.ExternalCustomerEntity;
 
 public interface ExternalCustomerService {
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
index b5dc546c2b..461a31ead5 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
@@ -1,7 +1,5 @@
 package com.epmet.service;
 
-import java.util.Date;
-
 /**
  * @Description 工作日信息维护
  * @Author yinzuomei
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java
index 8d4e4673cc..08edda9c26 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java
@@ -2,14 +2,12 @@ package com.epmet.service;
 
 import com.epmet.dto.form.CostDayFormDTO;
 import com.epmet.dto.form.WorkDayFormDTO;
-import com.epmet.dto.result.CostDayResultDTO;
 import com.epmet.dto.form.WorkMinuteFormDTO;
+import com.epmet.dto.result.CostDayResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 
-
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @Description 工作日计算
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeChildServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeChildServiceImpl.java
index 3b6aeaf587..4ee8aa1d88 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeChildServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeChildServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.AreaCodeChildDao;
 import com.epmet.dto.AreaCodeChildDTO;
 import com.epmet.entity.AreaCodeChildEntity;
@@ -101,4 +101,4 @@ public class AreaCodeChildServiceImpl extends BaseServiceImpl<AreaCodeChildDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
index 518577e6c0..23fd94a4d7 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CalenderDao;
 import com.epmet.dto.CalenderDTO;
 import com.epmet.dto.form.CalenderFormDTO;
@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -184,4 +183,4 @@ public class CalenderServiceImpl extends BaseServiceImpl<CalenderDao, CalenderEn
         }
         return typeName;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java
index 795f553af5..3aea2a5b23 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java
@@ -3,8 +3,8 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
-import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.ImportTaskDao;
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java
index 8485f229cb..e83d69b86c 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java
@@ -1,10 +1,7 @@
 package com.epmet.task;
 
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 
diff --git a/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/DemoDTO.java b/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/DemoDTO.java
index b209964a5b..9d6677c92a 100644
--- a/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/DemoDTO.java
+++ b/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/DemoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class DemoDTO implements Serializable {
      */
 	private String delFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/form/SaveCustomerFormDTO.java b/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/form/SaveCustomerFormDTO.java
index 18bb464e28..3a11a68fdd 100644
--- a/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/form/SaveCustomerFormDTO.java
+++ b/epmet-module/epmet-demo/epmet-demo-client/src/main/java/com/epmet/dto/form/SaveCustomerFormDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
index 5949155e2b..ab59c63ca4 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.DemoDTO;
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/entity/DemoEntity.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/entity/DemoEntity.java
index 0484fc7f7f..a41265ee09 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/entity/DemoEntity.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/entity/DemoEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java
index 8b93d60979..92dc5fc965 100644
--- a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java
+++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/OpenApiConfig.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/OpenApiConfig.java
index 706c01af35..e8ca1d03f1 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/OpenApiConfig.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/OpenApiConfig.java
@@ -2,7 +2,6 @@ package com.epmet.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenApiAccessTokenController.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenApiAccessTokenController.java
index 5f24502bfa..5adfcdc051 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenApiAccessTokenController.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenApiAccessTokenController.java
@@ -12,7 +12,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("open-api")
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActCustomizedDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActCustomizedDTO.java
index ece26c588e..55346eb8c1 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActCustomizedDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActCustomizedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class ActCustomizedDTO implements Serializable {
      */
 	private String delFlag;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLivePicDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLivePicDTO.java
index 01d2cfc1da..9884821862 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLivePicDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLivePicDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ActLivePicDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLiveRecDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLiveRecDTO.java
index 6cf15c2095..6fbf1551f3 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLiveRecDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActLiveRecDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 活动实况记录
@@ -104,4 +104,4 @@ public class ActLiveRecDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInPicDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInPicDTO.java
index bcc31e2525..3ee2870ddd 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInPicDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInPicDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ActSignInPicDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInRecDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInRecDTO.java
index ab374cddfe..831b4af233 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInRecDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSignInRecDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 活动签到记录
@@ -114,4 +114,4 @@ public class ActSignInRecDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java
index 41bb47f832..9e8acacb88 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class ActSummaryDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcActivityUnitRelationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcActivityUnitRelationDTO.java
index 8af5942af0..4ac87c9c53 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcActivityUnitRelationDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcActivityUnitRelationDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -86,4 +87,4 @@ public class IcActivityUnitRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java
index 52338da6e9..6364dc08e2 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -104,7 +105,7 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
 	private String latitude;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -138,4 +139,4 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
      */
 	private String remark;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
index 53c7196083..f74f2697e9 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -59,7 +60,7 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
 	private String personPhone;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -88,4 +89,4 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
index 898b01df9d..f0304874e5 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -138,4 +139,4 @@ public class IcSocietyOrgDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java
index bf365960a4..ef9a3e16e8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class LatestActContentDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActServiceRelationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActServiceRelationDTO.java
index b25b10f432..c21be10278 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActServiceRelationDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActServiceRelationDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -76,4 +77,4 @@ public class LatestActServiceRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActUnitRelationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActUnitRelationDTO.java
index 534053660d..6e405d50de 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActUnitRelationDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActUnitRelationDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -81,4 +82,4 @@ public class LatestActUnitRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
index 2a693143d3..3a931390b8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java
index 68d0176e35..32556b2c27 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java
@@ -1,13 +1,11 @@
 package com.epmet.dto.form;
 
 import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java
index deae2c3f43..79ba3799b9 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form.demand;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.Set;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActInsertLiveFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActInsertLiveFormDTO.java
index e6181d9d9d..56462c20aa 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActInsertLiveFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActInsertLiveFormDTO.java
@@ -17,11 +17,9 @@
 
 package com.epmet.dto.form.resi;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java
index 4a9973d735..3ca8a15876 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java
@@ -2,9 +2,6 @@ package com.epmet.dto.form.resi;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * @Description
  * @Author wangxianzhang
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java
index f4ad2ca4f1..b23be624f0 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActContentResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActContentResultDTO.java
index 4d6e9bbf3f..75d8992d49 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActContentResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActContentResultDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dto.result.resi;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java
index f8f6832129..b320b739a7 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingUserDetailResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result.work;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationPersonnelController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationPersonnelController.java
index 76a64ce4f0..1565ff7182 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationPersonnelController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationPersonnelController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
 import com.epmet.excel.IcCommunitySelfOrganizationPersonnelExcel;
 import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("iccommunityselforganizationpersonnel")
 public class IcCommunitySelfOrganizationPersonnelController {
-    
+
     @Autowired
     private IcCommunitySelfOrganizationPersonnelService icCommunitySelfOrganizationPersonnelService;
 
@@ -91,4 +91,4 @@ public class IcCommunitySelfOrganizationPersonnelController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcCommunitySelfOrganizationPersonnelExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java
index b49c577f00..7ea8387a9a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java
@@ -10,7 +10,10 @@ import com.epmet.dto.form.CompletionFormDTO;
 import com.epmet.service.IcPartyUnitCompletionService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -22,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("icpartyunitcompletion")
 public class IcPartyUnitCompletionController {
-    
+
     @Autowired
     private IcPartyUnitCompletionService icPartyUnitCompletionService;
 
@@ -47,4 +50,4 @@ public class IcPartyUnitCompletionController {
         icPartyUnitCompletionService.delete(dto.getId());
         return new Result();
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
index 8c2e85a6a1..a0e926944e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
@@ -2,12 +2,12 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.form.resi.*;
 import com.epmet.dto.result.resi.*;
 import com.epmet.service.*;
-import com.epmet.commons.tools.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
index 9d018d7d81..b8324bee0a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActDraftController.java
@@ -4,8 +4,13 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.work.*;
-import com.epmet.dto.result.work.*;
+import com.epmet.dto.form.work.ActPreviewFormDTO;
+import com.epmet.dto.form.work.DraftActContentFormDTO;
+import com.epmet.dto.form.work.DraftActInfoFormDTO;
+import com.epmet.dto.result.work.ActPreviewResultDTO;
+import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
+import com.epmet.dto.result.work.PublishActInitResultDTO;
+import com.epmet.dto.result.work.SaveActDraftResultDTO;
 import com.epmet.service.WorkActDraftService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -41,10 +46,10 @@ public class WorkActDraftController {
 
     /**
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.LatestdraftActInfoResultDTO>
-     * @param 
+     * @param
      * @author yinzuomei
      * @description 获取最近一次编辑的活动,用户选择继续编辑上次的活动
-     * @Date 2020/7/20 21:56 
+     * @Date 2020/7/20 21:56
      **/
     @PostMapping("latestdraft")
     public Result<LatestDraftActInfoResultDTO> getLatestDraft(){
@@ -81,7 +86,7 @@ public class WorkActDraftController {
      * @param formDTO
      * @author yinzuomei
      * @description 预览-查看活动详情
-     * @Date 2020/7/21 17:24 
+     * @Date 2020/7/21 17:24
      **/
     @PostMapping("preview")
     public Result<ActPreviewResultDTO> previewActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActPreviewFormDTO formDTO){
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java
index 5e421381a3..a7ddc2c6dc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java
@@ -2,7 +2,10 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.work.*;
+import com.epmet.dto.form.work.AactUserDetailFormDTO;
+import com.epmet.dto.form.work.ActIdFormDTO;
+import com.epmet.dto.form.work.AuditUserFormDTO;
+import com.epmet.dto.form.work.UserHistoricalActFormDTO;
 import com.epmet.dto.result.work.*;
 import com.epmet.service.WorkActUserService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSignInRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSignInRecDao.java
index ca383df81f..175b8e2c02 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSignInRecDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActSignInRecDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ActSignInRecDTO;
-import com.epmet.dto.form.resi.ResiActSignInFormDTO;
 import com.epmet.entity.ActSignInRecEntity;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java
index 60f62e3a8d..0e78731571 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java
@@ -20,7 +20,6 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcSocietyOrgDTO;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
-import com.epmet.dto.result.GetListSocietyOrgResultDTO;
 import com.epmet.dto.result.SocietyOrgListResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcSocietyOrgEntity;
@@ -60,4 +59,4 @@ public interface IcSocietyOrgDao extends BaseDao<IcSocietyOrgEntity> {
      * @Description 查询当前组织下的社会组织数据
      **/
     List<IcSocietyOrgDTO> getByAgencyId(@Param("agencyId") String agencyId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java
index c963c888df..0fea888353 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 活动内容
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActCustomizedEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActCustomizedEntity.java
index df76098d87..fd66f0eaaf 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActCustomizedEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActCustomizedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 爱心互助首页自定义配置
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLivePicEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLivePicEntity.java
index 23fa13cc21..38017f2063 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLivePicEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLivePicEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 活动实况图片表
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLiveRecEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLiveRecEntity.java
index ae2ecbc7e2..496f70178c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLiveRecEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActLiveRecEntity.java
@@ -20,13 +20,11 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 活动实况记录
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInPicEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInPicEntity.java
index 58fc1fbe95..690196316f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInPicEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInPicEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 活动签到图片表
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInRecEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInRecEntity.java
index c22b7322ee..0c8b595783 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInRecEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSignInRecEntity.java
@@ -20,13 +20,11 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 活动签到记录
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java
index a3e46a4196..bc09dfcc52 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 活动回顾表
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserRelationEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserRelationEntity.java
index bbb73239f9..49d0a18a5c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserRelationEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserRelationEntity.java
@@ -20,7 +20,6 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java
index fa00ec37e8..01db2e7108 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java
@@ -17,12 +17,8 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java
index 66e4309b16..c313f367fc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 社区自组织人员表
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
index da03e372e7..28a588f6f4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java
index f789736b80..65c11a447f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 联建单位
  *
@@ -49,7 +46,7 @@ public class IcPartyUnitEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 
+     *
      */
 	private String pids;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java
index 569156783f..7c6dcc0316 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandOperateLogEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandOperateLogEntity.java
index 127bc1c9e3..e0c52ba3b1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandOperateLogEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandOperateLogEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandSatisfactionEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandSatisfactionEntity.java
index 819fb8239d..c1d3a4b426 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandSatisfactionEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandSatisfactionEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandServiceEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandServiceEntity.java
index 8091aff8fc..af30ca6f3a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandServiceEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcUserDemandServiceEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java
index 0d78cdb59d..b22c65efed 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 最近一次编辑的活动内容
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java
index 011a57519f..03b679c9c4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/UserKindnessTimeLogEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/UserKindnessTimeLogEntity.java
index 79f151aaf4..86f481284f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/UserKindnessTimeLogEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/UserKindnessTimeLogEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户爱心时长记录表
  *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java
index fdf33d7b48..140d821022 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java
@@ -2,7 +2,6 @@ package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
 import lombok.Data;
 
 import java.util.List;
@@ -37,4 +36,4 @@ public class ExportCommunitySelfOrganizationExcel {
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> organizationPersonnel;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
index c39b3f9147..9ea9544285 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
@@ -18,11 +18,8 @@
 package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 联建活动
  *
@@ -50,4 +47,4 @@ public class IcPartyActivityExcel {
     @Excel(name = "活动时间")
     private String activityTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java
index 35fff240d9..c4392b5e5a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java
@@ -19,13 +19,11 @@ package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.epmet.commons.tools.utils.ExcelVerifyInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 社会组织管理
@@ -80,4 +78,4 @@ public class IcSocietyOrgExcel extends ExcelVerifyInfo implements Serializable {
     @Excel(name = "维度")
     private String latitude;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java
index 25a8f27af9..10a10f21ad 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java
@@ -6,7 +6,6 @@ import com.epmet.commons.tools.utils.ExcelVerifyInfo;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
index dc36ccda4f..c1fa1d1e2f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
@@ -20,14 +20,12 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.form.resi.*;
 import com.epmet.dto.result.resi.*;
 import com.epmet.entity.ActInfoEntity;
 
-import com.epmet.commons.tools.utils.Result;
-
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
index 79f1e0a477..6a61e4a199 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
@@ -29,7 +29,6 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationEntity;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -161,4 +160,4 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
     void importCommunitySelfOrganization(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId) throws IOException;
 
     List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActContentServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActContentServiceImpl.java
index 88e241dda9..76981bcdad 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActContentServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActContentServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActContentDao;
 import com.epmet.dto.ActContentDTO;
 import com.epmet.entity.ActContentEntity;
@@ -101,4 +101,4 @@ public class ActContentServiceImpl extends BaseServiceImpl<ActContentDao, ActCon
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLivePicServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLivePicServiceImpl.java
index 5f2bf70f66..74c66e1ea5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLivePicServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLivePicServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dto.ActLivePicDTO;
 import com.epmet.entity.ActLivePicEntity;
@@ -101,4 +101,4 @@ public class ActLivePicServiceImpl extends BaseServiceImpl<ActLivePicDao, ActLiv
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
index 3c7d9a6647..c45a4aeadc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
@@ -22,9 +22,7 @@ import com.alibaba.nacos.client.utils.StringUtils;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
-import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
@@ -35,7 +33,6 @@ import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
-import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dao.ActLiveRecDao;
@@ -83,7 +80,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
 
     @Autowired
     private ActInfoService actInfoService;
-    
+
     @Autowired
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActOperationRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActOperationRecServiceImpl.java
index aa83d22102..d47e55077f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActOperationRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActOperationRecServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActOperationRecDao;
 import com.epmet.dto.ActOperationRecDTO;
 import com.epmet.entity.ActOperationRecEntity;
@@ -101,4 +101,4 @@ public class ActOperationRecServiceImpl extends BaseServiceImpl<ActOperationRecD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActPointLogServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActPointLogServiceImpl.java
index 0f09783403..f88788f60c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActPointLogServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActPointLogServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActPointLogDao;
 import com.epmet.dto.ActPointLogDTO;
 import com.epmet.entity.ActPointLogEntity;
@@ -101,4 +101,4 @@ public class ActPointLogServiceImpl extends BaseServiceImpl<ActPointLogDao, ActP
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInPicServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInPicServiceImpl.java
index b9c54782e3..7803c418af 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInPicServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInPicServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActSignInPicDao;
 import com.epmet.dto.ActSignInPicDTO;
 import com.epmet.entity.ActSignInPicEntity;
@@ -101,4 +101,4 @@ public class ActSignInPicServiceImpl extends BaseServiceImpl<ActSignInPicDao, Ac
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActStatisticalServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActStatisticalServiceImpl.java
index 9dc1d82ede..9047bcc24f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActStatisticalServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActStatisticalServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActStatisticalDao;
 import com.epmet.dto.ActStatisticalDTO;
 import com.epmet.entity.ActStatisticalEntity;
@@ -101,4 +101,4 @@ public class ActStatisticalServiceImpl extends BaseServiceImpl<ActStatisticalDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java
index 9681011fd0..cf826ad5da 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java
@@ -20,10 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ActSummaryDao;
 import com.epmet.dto.ActSummaryDTO;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserLogServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserLogServiceImpl.java
index 72cc2395c9..de78b70fed 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserLogServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserLogServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ActUserLogDao;
 import com.epmet.dto.ActUserLogDTO;
 import com.epmet.entity.ActUserLogEntity;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
index 935a5cd8a8..b0a34f6a26 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
@@ -24,7 +24,6 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -48,7 +47,6 @@ import com.epmet.redis.ActUserRelationRedis;
 import com.epmet.service.ActInfoService;
 import com.epmet.service.ActUserLogService;
 import com.epmet.service.ActUserRelationService;
-import com.epmet.utils.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -56,7 +54,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户活动关系表
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationPersonnelServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationPersonnelServiceImpl.java
index 15b759def7..90cd5dbba6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationPersonnelServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationPersonnelServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcCommunitySelfOrganizationPersonnelDao;
 import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
 import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -109,4 +108,4 @@ public class IcCommunitySelfOrganizationPersonnelServiceImpl extends BaseService
         baseDao.deleteByOrgId(orgId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index 56c49c53c1..1443592a16 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -59,7 +59,6 @@ import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
index 9d73f7866a..7c6a07e751 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.LatestActContentDao;
 import com.epmet.dto.LatestActContentDTO;
 import com.epmet.dto.result.work.ActDraftContentDTOResultDTO;
@@ -154,4 +154,4 @@ public class LatestActContentServiceImpl extends BaseServiceImpl<LatestActConten
         return baseDao.previewActContent(actId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 0b5ee36509..846e342657 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -67,12 +67,6 @@ 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.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.Optional;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobController.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobController.java
index f6e9c26d69..ea5cad267c 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobController.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/ScheduleJobController.java
@@ -8,7 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/dao/ScheduleJobDao.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/dao/ScheduleJobDao.java
index 259dd99845..ac33ccc830 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/dao/ScheduleJobDao.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/dao/ScheduleJobDao.java
@@ -13,7 +13,6 @@ import com.epmet.dto.ScheduleJobTypeDTO;
 import com.epmet.entity.ScheduleJobEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 import java.util.Map;
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DimPartyMemberServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DimPartyMemberServiceImpl.java
index ca4d773f2a..9b7f7fb480 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DimPartyMemberServiceImpl.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DimPartyMemberServiceImpl.java
@@ -8,8 +8,6 @@ import com.epmet.service.DimPartyMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
-
 /**
  * @Author zxc
  * @DateTime 2020/9/17 3:06 下午
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index 290c04733e..5d45cf1c08 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -3,8 +3,8 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
-import com.epmet.service.StatsGroupService;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.StatsGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TestTaskServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TestTaskServiceImpl.java
index a1e3654124..1bcfc9d3ba 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TestTaskServiceImpl.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TestTaskServiceImpl.java
@@ -1,10 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.feign.DemoFeignClient;
 import com.epmet.service.TestTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GroupAndHotTopicTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GroupAndHotTopicTask.java
index cfba46d52f..9139559102 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GroupAndHotTopicTask.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GroupAndHotTopicTask.java
@@ -2,9 +2,7 @@ package com.epmet.task;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
-import com.epmet.service.DimInitService;
 import com.epmet.service.StatsGroupService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/WxmpMessageConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/WxmpMessageConstant.java
index 5c8b364e1f..18ef3553e8 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/WxmpMessageConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/WxmpMessageConstant.java
@@ -1,8 +1,5 @@
 package com.epmet.constant;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @description: 微信订阅消息常量
  * @author: liushaowen
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailLogDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailLogDTO.java
index 29ea205bcc..3fdab36775 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailLogDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailLogDTO.java
@@ -9,7 +9,6 @@
 package com.epmet.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailTemplateDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailTemplateDTO.java
index d5163604f9..59b5a01c8d 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailTemplateDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysMailTemplateDTO.java
@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpMsgSendRecordDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpMsgSendRecordDTO.java
index ff1b7a4cf0..4db4c6d631 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpMsgSendRecordDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpMsgSendRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpResiUserSubscribeDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpResiUserSubscribeDTO.java
index e8b2f2a1fb..04841db3a8 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpResiUserSubscribeDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpResiUserSubscribeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class WxmpResiUserSubscribeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpTemplateMsgSubscribeStatusDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpTemplateMsgSubscribeStatusDTO.java
index 59ad254400..98b4753be7 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpTemplateMsgSubscribeStatusDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpTemplateMsgSubscribeStatusDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -105,4 +106,4 @@ public class WxmpTemplateMsgSubscribeStatusDTO implements Serializable {
 
 	private Date templateId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendDataDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendDataDTO.java
index 75696d1a4e..d394cf9a75 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendDataDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendDataDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -59,7 +60,7 @@ public class WxmpUpdateSendDataDTO implements Serializable {
 	private String agencyId;
 
     /**
-     * 网格ID 
+     * 网格ID
      */
 	private String gridId;
 
@@ -108,4 +109,4 @@ public class WxmpUpdateSendDataDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendRecordDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendRecordDTO.java
index a1e8a23d8e..ba5b2bab07 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendRecordDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUpdateSendRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -39,7 +40,7 @@ public class WxmpUpdateSendRecordDTO implements Serializable {
 	private String id;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
@@ -54,7 +55,7 @@ public class WxmpUpdateSendRecordDTO implements Serializable {
 	private String clientType;
 
     /**
-     * 消息模板Id 
+     * 消息模板Id
      */
 	private String templateId;
 
@@ -64,7 +65,7 @@ public class WxmpUpdateSendRecordDTO implements Serializable {
 	private String userId;
 
     /**
-     * openId 
+     * openId
      */
 	private String wxOpenId;
 
@@ -74,17 +75,17 @@ public class WxmpUpdateSendRecordDTO implements Serializable {
 	private String behaviorType;
 
     /**
-     * 消息标题 
+     * 消息标题
      */
 	private String title;
 
     /**
-     * 消息内容 
+     * 消息内容
      */
 	private String content;
 
     /**
-     * 消息时间 
+     * 消息时间
      */
 	private Date time;
 
@@ -128,4 +129,4 @@ public class WxmpUpdateSendRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUserSubscribeRecordDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUserSubscribeRecordDTO.java
index 901023e9ea..e72da3ca7c 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUserSubscribeRecordDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpUserSubscribeRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class WxmpUserSubscribeRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpWorkUserSubscribeDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpWorkUserSubscribeDTO.java
index 632c9ecf84..e7f426327b 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpWorkUserSubscribeDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/WxmpWorkUserSubscribeDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 工作端用户订阅模板消息有效次数记录表 
+ * 工作端用户订阅模板消息有效次数记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-10-21
@@ -98,4 +99,4 @@ public class WxmpWorkUserSubscribeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReceiverGroupCommonFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReceiverGroupCommonFormDTO.java
index afcf24e16e..510404f53f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReceiverGroupCommonFormDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReceiverGroupCommonFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.Set;
 
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java
index 2e9e783587..4df9bffd88 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java
@@ -1,9 +1,6 @@
 package com.epmet.dto.form;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxmpMessagePushFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxmpMessagePushFormDTO.java
index 067ea3b3bb..2928e2dace 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxmpMessagePushFormDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxmpMessagePushFormDTO.java
@@ -3,9 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @description: 微信订阅消息FormDTO
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
index b3681a0b33..920d508b89 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
@@ -3,14 +3,8 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.SysSmsDTO;
-import com.epmet.dto.form.ProjectSendMsgFormDTO;
-import com.epmet.dto.form.SendVerificationCodeFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.form.WxSubscribeMessageFormDTO;
-import com.epmet.dto.form.WxSubscribeUpdateFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.SendVerificationCodeResultDTO;
-import com.epmet.feign.fallback.EpmetMessageOpenFeignClientFallback;
 import com.epmet.feign.fallback.EpmetMessageOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
index d9a044d73d..eba096ff0f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
@@ -4,15 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.SysSmsDTO;
-import com.epmet.dto.form.ProjectSendMsgFormDTO;
-import com.epmet.dto.form.SendVerificationCodeFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.form.WxSubscribeMessageFormDTO;
-import com.epmet.dto.form.WxSubscribeUpdateFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.SendVerificationCodeResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java
index 81bd630e91..fa7af35baf 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java
@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Set;
 
@@ -47,7 +46,7 @@ import java.util.Set;
 @RestController
 @RequestMapping("info")
 public class InfoController {
-    
+
     @Autowired
     private InfoService infoService;
 
@@ -127,11 +126,11 @@ public class InfoController {
 
     /**
      * 添加群组
-     * 
+     *
      * @param tokenDto
-     * @param formDTO 
-     * @return  com.epmet.commons.tools.utils.Result<AddReceiverGroupResultDTO> 
-     * @author yinzuomei 
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<AddReceiverGroupResultDTO>
+     * @author yinzuomei
      * @date 2021/8/20 9:58 上午
      */
     @NoRepeatSubmit
@@ -231,4 +230,4 @@ public class InfoController {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java
index 532084b5fe..f3adb29d9d 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java
@@ -8,7 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.SysMailLogDTO;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java
index 1542235bf2..c41ad3195d 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java
@@ -9,7 +9,6 @@
 package com.epmet.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java
index 61bfa0166a..3bcbf66610 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java
@@ -17,7 +17,6 @@
 
 package com.epmet.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMsgSendRecordController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMsgSendRecordController.java
index ad71a5db81..b3baf267ff 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMsgSendRecordController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMsgSendRecordController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpMsgSendRecordDTO;
 import com.epmet.excel.WxmpMsgSendRecordExcel;
 import com.epmet.service.WxmpMsgSendRecordService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmpmsgsendrecord")
 public class WxmpMsgSendRecordController {
-    
+
     @Autowired
     private WxmpMsgSendRecordService wxmpMsgSendRecordService;
 
@@ -91,4 +91,4 @@ public class WxmpMsgSendRecordController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpMsgSendRecordExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpResiUserSubscribeController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpResiUserSubscribeController.java
index e4c38f9478..1bc92cf008 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpResiUserSubscribeController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpResiUserSubscribeController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpResiUserSubscribeDTO;
 import com.epmet.excel.WxmpResiUserSubscribeExcel;
 import com.epmet.service.WxmpResiUserSubscribeService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmpresiusersubscribe")
 public class WxmpResiUserSubscribeController {
-    
+
     @Autowired
     private WxmpResiUserSubscribeService wxmpResiUserSubscribeService;
 
@@ -91,4 +91,4 @@ public class WxmpResiUserSubscribeController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpResiUserSubscribeExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpTemplateMsgSubscribeStatusController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpTemplateMsgSubscribeStatusController.java
index a80fd35b58..9c80d8181e 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpTemplateMsgSubscribeStatusController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpTemplateMsgSubscribeStatusController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpTemplateMsgSubscribeStatusDTO;
 import com.epmet.excel.WxmpTemplateMsgSubscribeStatusExcel;
 import com.epmet.service.WxmpTemplateMsgSubscribeStatusService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmptemplatemsgsubscribestatus")
 public class WxmpTemplateMsgSubscribeStatusController {
-    
+
     @Autowired
     private WxmpTemplateMsgSubscribeStatusService wxmpTemplateMsgSubscribeStatusService;
 
@@ -91,4 +91,4 @@ public class WxmpTemplateMsgSubscribeStatusController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpTemplateMsgSubscribeStatusExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendDataController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendDataController.java
index 0704f912c6..a7ca7fcd14 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendDataController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendDataController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpUpdateSendDataDTO;
 import com.epmet.excel.WxmpUpdateSendDataExcel;
 import com.epmet.service.WxmpUpdateSendDataService;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendRecordController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendRecordController.java
index 42daed9b09..fd54b431aa 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendRecordController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUpdateSendRecordController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpUpdateSendRecordDTO;
 import com.epmet.excel.WxmpUpdateSendRecordExcel;
 import com.epmet.service.WxmpUpdateSendRecordService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmpupdatesendrecord")
 public class WxmpUpdateSendRecordController {
-    
+
     @Autowired
     private WxmpUpdateSendRecordService wxmpUpdateSendRecordService;
 
@@ -91,4 +91,4 @@ public class WxmpUpdateSendRecordController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpUpdateSendRecordExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUserSubscribeRecordController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUserSubscribeRecordController.java
index e30eace2f5..90a9bd716f 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUserSubscribeRecordController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpUserSubscribeRecordController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpUserSubscribeRecordDTO;
 import com.epmet.excel.WxmpUserSubscribeRecordExcel;
 import com.epmet.service.WxmpUserSubscribeRecordService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmpusersubscriberecord")
 public class WxmpUserSubscribeRecordController {
-    
+
     @Autowired
     private WxmpUserSubscribeRecordService wxmpUserSubscribeRecordService;
 
@@ -91,4 +91,4 @@ public class WxmpUserSubscribeRecordController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpUserSubscribeRecordExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpWorkUserSubscribeController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpWorkUserSubscribeController.java
index be838ea49d..9d3bee7d33 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpWorkUserSubscribeController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpWorkUserSubscribeController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.WxmpWorkUserSubscribeDTO;
 import com.epmet.excel.WxmpWorkUserSubscribeExcel;
 import com.epmet.service.WxmpWorkUserSubscribeService;
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 工作端用户订阅模板消息有效次数记录表 
+ * 工作端用户订阅模板消息有效次数记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-10-21
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmpworkusersubscribe")
 public class WxmpWorkUserSubscribeController {
-    
+
     @Autowired
     private WxmpWorkUserSubscribeService wxmpWorkUserSubscribeService;
 
@@ -91,4 +91,4 @@ public class WxmpWorkUserSubscribeController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpWorkUserSubscribeExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/email/EmailUtils.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/email/EmailUtils.java
index 727a36e322..8aaad6f081 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/email/EmailUtils.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/email/EmailUtils.java
@@ -9,7 +9,6 @@
 package com.epmet.email;
 
 import cn.hutool.core.map.MapUtil;
-import freemarker.template.Template;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.entity.SysMailTemplateEntity;
@@ -18,6 +17,7 @@ import com.epmet.remote.ParamsRemoteService;
 import com.epmet.service.SysMailLogService;
 import com.epmet.service.SysMailTemplateService;
 import com.epmet.utils.ModuleConstant;
+import freemarker.template.Template;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoEntity.java
index d3cd0ca82f..b9ae208e11 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 消息主表
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoGroupReceiversEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoGroupReceiversEntity.java
index 9de1c52bc0..b1657c1c8a 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoGroupReceiversEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoGroupReceiversEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 消息-群组成员关系表
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReceiverGroupEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReceiverGroupEntity.java
index d7efe67896..e55a5381db 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReceiverGroupEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReceiverGroupEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 消息-群组表
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReplyEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReplyEntity.java
index 9e67742cae..140857a334 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReplyEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/InfoReplyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 消息回复表
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessageEntity.java
index effdb2d59b..106ead21b7 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessageEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessageEntity.java
@@ -18,13 +18,9 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.omg.CORBA.StringHolder;
-
-import java.util.Date;
 
 /**
  * 系统消息表
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessagePenddingEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessagePenddingEntity.java
index 87a7956504..8f8b252162 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessagePenddingEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SystemMessagePenddingEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 系统消息表
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpMsgSendRecordEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpMsgSendRecordEntity.java
index 0e671bca3f..b7bff9105d 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpMsgSendRecordEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpMsgSendRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpResiUserSubscribeEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpResiUserSubscribeEntity.java
index cff96c779d..e3f1365036 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpResiUserSubscribeEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpResiUserSubscribeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 居民端用户订阅模板消息次数记录表
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java
index 3e5d685841..9ca4917603 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户模板消息订阅授权状态表（记录我们自己和微信的授权页用户勾选的状态）
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendDataEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendDataEntity.java
index a4395a1bf9..63ed372faf 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendDataEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendDataEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 订阅消息发送数据表(内容更新消息提醒、关注更新提醒)
  *
@@ -59,7 +56,7 @@ public class WxmpUpdateSendDataEntity extends BaseEpmetEntity {
 	private String agencyId;
 
     /**
-     * 网格ID 
+     * 网格ID
      */
 	private String gridId;
 
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendRecordEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendRecordEntity.java
index 9497a3475e..c8c97b26d7 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendRecordEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUpdateSendRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,7 @@ public class WxmpUpdateSendRecordEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
@@ -54,7 +53,7 @@ public class WxmpUpdateSendRecordEntity extends BaseEpmetEntity {
 	private String clientType;
 
     /**
-     * 消息模板Id 
+     * 消息模板Id
      */
 	private String templateId;
 
@@ -64,7 +63,7 @@ public class WxmpUpdateSendRecordEntity extends BaseEpmetEntity {
 	private String userId;
 
     /**
-     * openId 
+     * openId
      */
 	private String wxOpenId;
 
@@ -74,17 +73,17 @@ public class WxmpUpdateSendRecordEntity extends BaseEpmetEntity {
 	private String behaviorType;
 
     /**
-     * 消息标题 
+     * 消息标题
      */
 	private String title;
 
     /**
-     * 消息内容 
+     * 消息内容
      */
 	private String content;
 
     /**
-     * 消息时间 
+     * 消息时间
      */
 	private Date time;
 
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUserSubscribeRecordEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUserSubscribeRecordEntity.java
index 8d40463334..5b5ec39475 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUserSubscribeRecordEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpUserSubscribeRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户触发订阅的行为记录表（同时记录微信授权页每次勾选的状态）
  *
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpWorkUserSubscribeEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpWorkUserSubscribeEntity.java
index 124a450386..aa28b82085 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpWorkUserSubscribeEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpWorkUserSubscribeEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 工作端用户订阅模板消息有效次数记录表 
+ * 工作端用户订阅模板消息有效次数记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-10-21
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/InfoService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/InfoService.java
index 277bb43a64..120881acfa 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/InfoService.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/InfoService.java
@@ -20,7 +20,6 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AddReceiverGroupResultDTO;
-import com.epmet.dto.result.ReceiverGroupCommonResultDTO;
 import com.epmet.dto.result.ReplyInfoResultDTO;
 import com.epmet.dto.result.SendInfoResultDTO;
 import com.epmet.entity.InfoEntity;
@@ -134,4 +133,4 @@ public interface InfoService extends BaseService<InfoEntity> {
      * @date 2021.09.13 13:54:45
      */
     void addInfoGroupMember(String receiverGroupId, String operatorId, Set<OrgCommonDTO> orgList, List<String> staffIdList);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java
index ce8417175c..3e31a06c94 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java
@@ -28,6 +28,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.StaffMessageResultDTO;
 import com.epmet.dto.result.StaffUnReadMsgResultDTO;
 import com.epmet.entity.UserMessageEntity;
+
 import java.util.List;
 import java.util.Map;
 
@@ -148,4 +149,4 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
 	 * @Description 【消息】删除已读消息列表
 	 **/
     void delReadMsg(String userId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
index 27ee4adc41..78e21226a2 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java
@@ -33,7 +33,6 @@ import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AddReceiverGroupResultDTO;
-import com.epmet.dto.result.ReceiverGroupCommonResultDTO;
 import com.epmet.dto.result.ReplyInfoResultDTO;
 import com.epmet.dto.result.SendInfoResultDTO;
 import com.epmet.entity.*;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMsgSendRecordServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMsgSendRecordServiceImpl.java
index f61a19d9d7..33cc091b72 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMsgSendRecordServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMsgSendRecordServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpMsgSendRecordDao;
 import com.epmet.dto.WxmpMsgSendRecordDTO;
 import com.epmet.entity.WxmpMsgSendRecordEntity;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpResiUserSubscribeServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpResiUserSubscribeServiceImpl.java
index 2c317e037b..437e553b51 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpResiUserSubscribeServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpResiUserSubscribeServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpResiUserSubscribeDao;
 import com.epmet.dto.WxmpResiUserSubscribeDTO;
 import com.epmet.entity.WxmpResiUserSubscribeEntity;
@@ -101,4 +101,4 @@ public class WxmpResiUserSubscribeServiceImpl extends BaseServiceImpl<WxmpResiUs
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpTemplateMsgSubscribeStatusServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpTemplateMsgSubscribeStatusServiceImpl.java
index 5ea81bdd63..f76e49b21d 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpTemplateMsgSubscribeStatusServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpTemplateMsgSubscribeStatusServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpTemplateMsgSubscribeStatusDao;
 import com.epmet.dto.WxmpTemplateMsgSubscribeStatusDTO;
 import com.epmet.entity.WxmpTemplateMsgSubscribeStatusEntity;
@@ -101,4 +101,4 @@ public class WxmpTemplateMsgSubscribeStatusServiceImpl extends BaseServiceImpl<W
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendDataServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendDataServiceImpl.java
index a3e1718233..cd066bf3bb 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendDataServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendDataServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpUpdateSendDataDao;
 import com.epmet.dto.WxmpUpdateSendDataDTO;
 import com.epmet.entity.WxmpUpdateSendDataEntity;
@@ -101,4 +101,4 @@ public class WxmpUpdateSendDataServiceImpl extends BaseServiceImpl<WxmpUpdateSen
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendRecordServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendRecordServiceImpl.java
index 98b61d4444..807ff2ffd6 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendRecordServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUpdateSendRecordServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpUpdateSendRecordDao;
 import com.epmet.dto.WxmpUpdateSendRecordDTO;
 import com.epmet.entity.WxmpUpdateSendRecordEntity;
@@ -101,4 +101,4 @@ public class WxmpUpdateSendRecordServiceImpl extends BaseServiceImpl<WxmpUpdateS
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUserSubscribeRecordServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUserSubscribeRecordServiceImpl.java
index 9326681fe4..5cb8531a85 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUserSubscribeRecordServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpUserSubscribeRecordServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpUserSubscribeRecordDao;
 import com.epmet.dto.WxmpUserSubscribeRecordDTO;
 import com.epmet.entity.WxmpUserSubscribeRecordEntity;
@@ -101,4 +101,4 @@ public class WxmpUserSubscribeRecordServiceImpl extends BaseServiceImpl<WxmpUser
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpWorkUserSubscribeServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpWorkUserSubscribeServiceImpl.java
index 93a3ad4147..157abf3107 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpWorkUserSubscribeServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpWorkUserSubscribeServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.WxmpWorkUserSubscribeDao;
 import com.epmet.dto.WxmpWorkUserSubscribeDTO;
 import com.epmet.entity.WxmpWorkUserSubscribeEntity;
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 工作端用户订阅模板消息有效次数记录表 
+ * 工作端用户订阅模板消息有效次数记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-10-21
@@ -101,4 +101,4 @@ public class WxmpWorkUserSubscribeServiceImpl extends BaseServiceImpl<WxmpWorkUs
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java
index 84ab8bb41e..c3616ea064 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java
@@ -10,16 +10,16 @@ package com.epmet.sms;
 
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
-import com.epmet.commons.tools.exception.ErrorCode;
-import com.epmet.dto.SysSmsDTO;
-import com.github.qcloudsms.SmsSingleSender;
-import com.github.qcloudsms.SmsSingleSenderResult;
 import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dto.SysSmsDTO;
 import com.epmet.enums.PlatformEnum;
 import com.epmet.exception.ModuleErrorCode;
 import com.epmet.service.SysSmsService;
+import com.github.qcloudsms.SmsSingleSender;
+import com.github.qcloudsms.SmsSingleSenderResult;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/SmsConfig.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/SmsConfig.java
index 5aa4eb2dc8..56b3e0e43d 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/SmsConfig.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/SmsConfig.java
@@ -10,7 +10,6 @@ package com.epmet.sms;
 
 import com.epmet.commons.tools.validator.group.AliyunGroup;
 import com.epmet.commons.tools.validator.group.QcloudGroup;
-
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java
index 3c9b9a44cd..9cd575cbcf 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java
@@ -11,8 +11,8 @@ package com.epmet.cloud;
 import com.epmet.commons.tools.validator.group.AliyunGroup;
 import com.epmet.commons.tools.validator.group.QcloudGroup;
 import com.epmet.commons.tools.validator.group.QiniuGroup;
-import com.epmet.validator.group.*;
-
+import com.epmet.validator.group.FastDFSGroup;
+import com.epmet.validator.group.LocalGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 import org.hibernate.validator.constraints.URL;
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/FastDFSCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/FastDFSCloudStorageService.java
index a2290ec7f1..1cc33ded41 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/FastDFSCloudStorageService.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/FastDFSCloudStorageService.java
@@ -8,11 +8,11 @@
 
 package com.epmet.cloud;
 
-import com.github.tobato.fastdfs.domain.StorePath;
-import com.github.tobato.fastdfs.service.DefaultGenerateStorageClient;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.exception.ModuleErrorCode;
+import com.github.tobato.fastdfs.domain.StorePath;
+import com.github.tobato.fastdfs.service.DefaultGenerateStorageClient;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java
index 7c289e63ac..8763b204e8 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java
@@ -8,6 +8,8 @@
 
 package com.epmet.cloud;
 
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.exception.ModuleErrorCode;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.ClientConfig;
 import com.qcloud.cos.auth.BasicCOSCredentials;
@@ -16,8 +18,6 @@ import com.qcloud.cos.model.ObjectMetadata;
 import com.qcloud.cos.model.PutObjectRequest;
 import com.qcloud.cos.model.PutObjectResult;
 import com.qcloud.cos.region.Region;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.exception.ModuleErrorCode;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java
index a4aa05ecda..91bb7e32ae 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java
@@ -8,14 +8,13 @@
 
 package com.epmet.cloud;
 
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.exception.ModuleErrorCode;
 import com.qiniu.common.Zone;
 import com.qiniu.http.Response;
 import com.qiniu.storage.Configuration;
 import com.qiniu.storage.UploadManager;
 import com.qiniu.util.Auth;
-
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.exception.ModuleErrorCode;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointTotalDetailDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointTotalDetailDTO.java
index f057816b87..57eec40b83 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointTotalDetailDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/BizPointTotalDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class BizPointTotalDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdjustmentLogDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdjustmentLogDTO.java
index 1f94db9ccd..73557b32c2 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdjustmentLogDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdjustmentLogDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-27
@@ -34,7 +35,7 @@ public class PointAdjustmentLogDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -74,32 +75,32 @@ public class PointAdjustmentLogDTO implements Serializable {
 	private String userId;
 
     /**
-     * 
+     *
      */
 	private String delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
@@ -108,4 +109,4 @@ public class PointAdjustmentLogDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationLogDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationLogDTO.java
index 80e0e2bad1..2692cb2ceb 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationLogDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationLogDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class PointVerificationLogDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationStatisticalDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationStatisticalDailyDTO.java
index 94ccf1963a..5585e62bbd 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationStatisticalDailyDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationStatisticalDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class PointVerificationStatisticalDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/SysOperateLogDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/SysOperateLogDTO.java
index 9d0344e07d..bb53d90066 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/SysOperateLogDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/SysOperateLogDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class SysOperateLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java
index 4f8523d82a..d767bcb73a 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -126,4 +127,4 @@ public class UserPointActionLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointStatisticalDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointStatisticalDailyDTO.java
index 3cc6a6008f..9eb91971cb 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointStatisticalDailyDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointStatisticalDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class UserPointStatisticalDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointTotalDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointTotalDTO.java
index bb92d7f476..e682dc6b64 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointTotalDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointTotalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class UserPointTotalDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java
index ebfea4f918..19211b33ec 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AllPartyFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index b62546ef20..971b5ccb68 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.sun.webkit.LoadListenerClient;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java
index ea20744f4c..bb5b9d68d9 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java
index fdb09a68f3..71b09f0f9f 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankResultDTO.java
index 54f72cd275..56d70d96ac 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankResultDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 /**
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java
index 0afba7534e..6165878a5e 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java
@@ -7,7 +7,6 @@ import com.epmet.dto.InitPointRuleResultDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
-import com.epmet.feign.fallback.EpmetPointOpenFeignClientFallback;
 import com.epmet.feign.fallback.EpmetPointOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java
index 0fc8390a53..94a6c5b4ab 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java
@@ -9,7 +9,6 @@ import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
 import com.epmet.feign.EpmetPointOpenFeignClient;
-import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 947741b69d..f30f1738ac 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -1,7 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -16,15 +15,12 @@ import com.epmet.service.BizPointTotalDetailService;
 import com.epmet.service.BizPointUserTotalDetailService;
 import com.epmet.service.PointRuleService;
 import com.epmet.utils.ModuleConstant;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotBlank;
-import java.lang.management.MemoryManagerMXBean;
 import java.util.List;
 
 /**
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointTotalDetailEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointTotalDetailEntity.java
index b05bc59705..ff4b637b59 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointTotalDetailEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointTotalDetailEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 按业务类型积分总计
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointUserTotalDetailEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointUserTotalDetailEntity.java
index e0f2960604..d17a0e57ab 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointUserTotalDetailEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/BizPointUserTotalDetailEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 按业务类型积分总计
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdjustmentLogEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdjustmentLogEntity.java
index fcd110bcf0..023a3724ab 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdjustmentLogEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdjustmentLogEntity.java
@@ -20,15 +20,12 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-27
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationLogEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationLogEntity.java
index edddc8768f..1b4012d04c 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationLogEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationLogEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 核销记录/确认表
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationStatisticalDailyEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationStatisticalDailyEntity.java
index b2b752d052..d3d5a43858 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationStatisticalDailyEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationStatisticalDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员核销数据统计
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java
index 2a282b06f3..b1cb9c047c 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户积分行为记录
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointStatisticalDailyEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointStatisticalDailyEntity.java
index 907d284425..6f7709d62d 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointStatisticalDailyEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointStatisticalDailyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户积分统计情况
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointTotalEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointTotalEntity.java
index 6d8a3c6174..e82a206a8b 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointTotalEntity.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointTotalEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户积分总计
  *
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index a13fa70708..2140194111 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -21,9 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.BizPointTotalDetailDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
-import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
+import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 
 import java.util.List;
@@ -160,4 +160,4 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	 * @date 2021.09.08 13:34:49
 	 */
 	List<GroupPointRankingResultDTO> listMyGroupPointRanding(String userId, String gridId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 2fd521d1d9..ce0e94c93c 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -31,22 +32,21 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.BizPointTotalDetailDao;
 import com.epmet.dto.BizPointTotalDetailDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.dto.result.GroupPointRankingResultDTO;
+import com.epmet.entity.BizPointTotalDetailEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.GroupFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupsByMemberFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
-import com.epmet.dto.result.GroupPointRankingResultDTO;
-import com.epmet.entity.BizPointTotalDetailEntity;
-import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
@@ -58,7 +58,6 @@ import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -514,4 +513,4 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         }).collect(Collectors.toList());
         return groupDtoList;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java
index 5002214030..c21acfd9e2 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java
@@ -20,12 +20,12 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.PointAdjustmentLogDao;
 import com.epmet.dao.UserPointActionLogDao;
@@ -33,7 +33,6 @@ import com.epmet.dto.PointAdjustmentLogDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.PointAdjustmentFormDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.PointAdjustmentResultDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index e8f2a0687a..251046a50f 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -16,6 +16,7 @@
  */
 
 package com.epmet.service.impl;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.common.enu.PointUnitEnum;
@@ -42,7 +43,10 @@ import com.epmet.dao.RuleOperateLogDao;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.InitPointRuleResultDTO;
-import com.epmet.dto.form.*;
+import com.epmet.dto.form.CustomerFunctionListFormDTO;
+import com.epmet.dto.form.PointDetailFormDTO;
+import com.epmet.dto.form.PointRuleFormDTO;
+import com.epmet.dto.form.PointRuleListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.PointRuleDefaultEntity;
 import com.epmet.entity.PointRuleEntity;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
index 59e1360ef5..4ff33328e6 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
@@ -21,12 +21,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.PointVerificationLogDao;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java
index 677cc9cd23..ca64857d03 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationStatisticalDailyServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.PointVerificationStatisticalDailyDao;
 import com.epmet.dto.PointVerificationStatisticalDailyDTO;
 import com.epmet.entity.PointVerificationStatisticalDailyEntity;
@@ -122,4 +122,4 @@ public class PointVerificationStatisticalDailyServiceImpl extends BaseServiceImp
         baseDao.insertOrUpdate(entity);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthCodeDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthCodeDTO.java
index 5f8d148691..9144306910 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthCodeDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthCodeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class AuthCodeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -64,28 +65,28 @@ public class AuthCodeDTO implements Serializable {
 	private Date expiresInTime;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthResultRecordDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthResultRecordDTO.java
index 6d64c5af52..09f287bbc7 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthResultRecordDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthResultRecordDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 授权结果记录表 
+ * 授权结果记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-15
@@ -113,4 +114,4 @@ public class AuthResultRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthorizationInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthorizationInfoDTO.java
index e540f690d7..bd36e50384 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthorizationInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/AuthorizationInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class AuthorizationInfoDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -69,28 +70,28 @@ public class AuthorizationInfoDTO implements Serializable {
 	private String clientType;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BindingAccountDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BindingAccountDTO.java
index 87a4abdaac..4f554c927f 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BindingAccountDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BindingAccountDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -59,7 +60,7 @@ public class BindingAccountDTO implements Serializable {
 	private String clientType;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -88,4 +89,4 @@ public class BindingAccountDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BusinessInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BusinessInfoDTO.java
index e29f749675..d864e0fe3f 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BusinessInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/BusinessInfoDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 功能开通状况表 
+ * 功能开通状况表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-14
@@ -93,4 +94,4 @@ public class BusinessInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditRecordDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditRecordDTO.java
index 014490dad5..18cc738546 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditRecordDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditRecordDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 代码审核记录表 
+ * 代码审核记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-15
@@ -34,7 +35,7 @@ public class CodeAuditRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -141,4 +142,4 @@ weapp_audit_delay：审核延后
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
index afcedffee0..baf97e0d4d 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 代码审核j结果 
+ * 代码审核j结果
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -119,4 +120,4 @@ public class CodeAuditResultDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java
index 7e86cbaa17..05db1e112a 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 客户代码关联表 
+ * 客户代码关联表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -143,4 +144,4 @@ public class CodeCustomerDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeExtDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeExtDTO.java
index 0e4abe7130..a3811e8a49 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeExtDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeExtDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 代码第三方配置 
+ * 代码第三方配置
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-17
@@ -88,4 +89,4 @@ public class CodeExtDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeMediaDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeMediaDTO.java
index 09332ac8a3..404366c798 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeMediaDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeMediaDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 代码素材 
+ * 代码素材
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -88,4 +89,4 @@ public class CodeMediaDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java
index 65f67e142c..5fea0344f2 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 客户代码操作历史 
+ * 客户代码操作历史
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -98,4 +99,4 @@ public class CodeOperationHistoryDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentAccessTokenDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentAccessTokenDTO.java
index 037f39a214..94fbb01eb6 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentAccessTokenDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentAccessTokenDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -73,4 +74,4 @@ public class ComponentAccessTokenDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentVerifyTicketDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentVerifyTicketDTO.java
index c167790abb..18ee5d31cf 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentVerifyTicketDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/ComponentVerifyTicketDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class ComponentVerifyTicketDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java
index 3a106817f7..a2acb50148 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class CustomerMpDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FixationAppIdDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FixationAppIdDTO.java
index ad55fbb43d..d325d259ac 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FixationAppIdDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FixationAppIdDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 固定的AppId表 
+ * 固定的AppId表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-03
@@ -83,4 +84,4 @@ public class FixationAppIdDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FuncInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FuncInfoDTO.java
index 14cbcd763e..e70d8e22e7 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FuncInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/FuncInfoDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 授权给开发者的权限集列表	
+ * 授权给开发者的权限集列表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-14
@@ -59,28 +60,28 @@ public class FuncInfoDTO implements Serializable {
 	private String authorizationInfoAppid;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniCategoryInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniCategoryInfoDTO.java
index 098f476306..511989d866 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniCategoryInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniCategoryInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class MiniCategoryInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniInfoDTO.java
index 501f9437d2..919971d9f6 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class MiniInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniNetworkInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniNetworkInfoDTO.java
index c928d9afab..93c892666d 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniNetworkInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/MiniNetworkInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class MiniNetworkInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/OpenPlatformAccountDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/OpenPlatformAccountDTO.java
index f9dacb70ce..d4b7afbccb 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/OpenPlatformAccountDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/OpenPlatformAccountDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -50,7 +51,7 @@ public class OpenPlatformAccountDTO implements Serializable {
 	private String customerId;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -79,4 +80,4 @@ public class OpenPlatformAccountDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerAgencyDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerAgencyDTO.java
index 3ea9efa543..6d20af6293 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerAgencyDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerAgencyDTO.java
@@ -17,12 +17,12 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 
 /**
  * 客户根组织信息
@@ -115,4 +115,4 @@ public class PaCustomerAgencyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java
index c06721dc55..0e9b0811dd 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class PaCustomerDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerUserAgencyDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerUserAgencyDTO.java
index 5bec4b8aa1..400e54886e 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerUserAgencyDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerUserAgencyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class PaCustomerUserAgencyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaInfoDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaInfoDTO.java
index 8d5768aa62..1633835ec2 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaInfoDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaInfoDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 公众号信息表 
+ * 公众号信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-14
@@ -82,7 +83,7 @@ public class PaInfoDTO implements Serializable {
 	private String userName;
 
     /**
-     * 主体名称 
+     * 主体名称
      */
 	private String principalName;
 
@@ -126,4 +127,4 @@ public class PaInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java
index 5961351e0e..105ca99cc2 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class PaUserDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java
index d39c1a32df..cd21d44098 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class PaUserVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserWechatDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserWechatDTO.java
index 29106ab239..132cd59ae8 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserWechatDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserWechatDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -49,7 +50,7 @@ public class PaUserWechatDTO implements Serializable {
 	private String wxOpenId;
 
     /**
-     * 
+     *
      */
 	private String unionId;
 
@@ -118,4 +119,4 @@ public class PaUserWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PersonalTemplateDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PersonalTemplateDTO.java
index 574f772896..285c292e34 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PersonalTemplateDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PersonalTemplateDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-09
@@ -123,4 +124,4 @@ public class PersonalTemplateDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PreAuthTokenDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PreAuthTokenDTO.java
index e77f95db84..b3d457cd4a 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PreAuthTokenDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PreAuthTokenDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -44,7 +45,7 @@ public class PreAuthTokenDTO implements Serializable {
 	private String preAuthToken;
 
     /**
-     * 预授权码有效期  
+     * 预授权码有效期
      */
 	private Date expiresInTime;
 
@@ -73,4 +74,4 @@ public class PreAuthTokenDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PublicTemplateDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PublicTemplateDTO.java
index b4c8b1d7f7..fb4c422ecf 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PublicTemplateDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PublicTemplateDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-11
@@ -34,58 +35,58 @@ public class PublicTemplateDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
     /**
-     * 
+     *
      */
 	private String tid;
 
     /**
-     * 
+     *
      */
 	private String title;
 
     /**
-     * 
+     *
      */
 	private String type;
 
     /**
-     * 
+     *
      */
 	private String categoryId;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String delFlag;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java
index 4a21f3e3db..7be22cea1c 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java
@@ -3,11 +3,8 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-
 import javax.validation.constraints.NotBlank;
-
 import javax.validation.constraints.NotNull;
-
 import java.util.Date;
 
 
@@ -18,68 +15,68 @@ import java.util.Date;
 public class BlockChainProjectProcessFormDTO {
     @NotBlank(message = "处理ID必填")
     private String processId;
-    
+
     @NotBlank(message = "项目ID必填")
     private String projectId;
-    
+
     @NotBlank(message = "客户ID必填")
     private String customerId;
-    
+
     @NotBlank(message = "部门名称必填")
     private String departmentName;
-    
+
     @NotBlank(message = "组织ID必填")
     private String agencyId;
-    
+
     // 组织的ID
     private String agencyName;
-    
+
     @NotBlank(message = "部门ID必填")
     private String departmentId;
-    
+
     @NotBlank(message = "网格ID必填")
     private String gridId;
-    
+
     // 网格的名称
     private String gridName;
-    
+
     @NotBlank(message = "组织ID PATH必填")
     private String orgIdPath;
-    
+
     @NotBlank(message = "处理人员ID必填")
     private String staffId;
-    
+
     // 工作人员名字
     private String staffName;
-    
+
     @NotBlank(message = "操作类型必填")
     private String operation;
-    
+
     @NotBlank(message = "操作名称必填")
     private String operationName;
-    
+
     @NotBlank(message = "公开答复必填")
     private String publicReply;
-    
+
     @NotBlank(message = "内部备注必填必填")
     private String internalRemark;
-    
+
     @NotNull(message = "结束时间必填")
     private Date endTime;
-    
+
     @NotNull(message = "是否发送到外部系统必填")
     private Integer isSend;
-    
+
     @NotNull(message = "耗费天数必填")
     private String costWorkDays;
-    
+
     @NotBlank(message = "创建者ID必填")
     private String createdBy;
 
     // 创建者名字
     private String createrName;
-    
+
     @NotNull(message = "创建时间必填")
     private Date createdTime;
-    
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CheckPaUserFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CheckPaUserFormDTO.java
index c3bf330549..0d71f2dcde 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CheckPaUserFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CheckPaUserFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 公众号-发送短信验证码-接口入参
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java
index 54afadfc32..4754498f4e 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author zxc
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java
index 600b4d6b83..ef35c5e32e 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ModifyDomainFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
index 8fb394aa93..68db40c7aa 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java
index d74f56a2a3..80c34f2033 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SaveUserVisitedFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java
index fa671d63d5..377db8b038 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxCodeToTokenFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 公众号-wxcode换取token保存微信用户信息-接口入参
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxLoginFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxLoginFormDTO.java
index bd358f8614..63c35bd0f2 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxLoginFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WxLoginFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author sun
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeHistoryResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeHistoryResultDTO.java
index 1aa68a49c2..17c8a251e0 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeHistoryResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeHistoryResultDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
index 74b1bb54d4..dbb6eda479 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java
index f344e5c062..2b2f59ec31 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Author sun
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAndUserResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAndUserResultDTO.java
index 08035efd03..78f9767b21 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAndUserResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAndUserResultDTO.java
@@ -1,11 +1,6 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.PaCustomerDTO;
-import com.epmet.dto.PaUserDTO;
-import com.epmet.dto.PaUserWechatDTO;
-import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
index 27c9cc946d..f0fef19e58 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
@@ -2,13 +2,12 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
-import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallback;
+import com.epmet.dto.form.BlockChainCreateProjectFormDTO;
+import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.result.ProjectAssistResult;
+import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.feign.fallback.EpmetThirdOpenFeignClientFallbackFactory;
-import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
-import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import feign.codec.Encoder;
 import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
@@ -17,13 +16,13 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
index 3dfd425fd9..7b19e3efde 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
-import com.epmet.feign.fallback.ThirdOpenFeignClientFallback;
 import com.epmet.feign.fallback.ThirdOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
index e257b0347b..ebf63b3e49 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
@@ -3,16 +3,14 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.form.BlockChainCreateProjectFormDTO;
+import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
+import com.epmet.dto.result.ProjectAssistResult;
+import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.feign.EpmetThirdOpenFeignClient;
-import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
-import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 /**
  *
  * @author zhaoqifeng
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
index 5e21b0b853..973342dc57 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
@@ -6,7 +6,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.ThirdOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java
index 426bab2b82..c4be1156a9 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java
@@ -10,9 +10,6 @@ import com.epmet.dto.AccessTokenDTO;
 import com.epmet.dto.result.CustomerTokensResultDTO;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @description:
  * @author: liushaowen
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
index ed06d5059a..336df09999 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java
@@ -1,13 +1,10 @@
 package com.epmet.apiservice.impl;
 
 import com.epmet.apiservice.ApiService;
-import com.epmet.apiservice.result.LZGridPlatformBaseResult;
-import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
-import com.epmet.feign.OperCrmOpenFeignClient;
+import com.epmet.dto.result.ProjectAssistResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java
index 72e1330724..37da3635e2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java
@@ -6,11 +6,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.AuthCodeAndTimeFromDTO;
 import com.epmet.service.ComponentVerifyTicketService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author zxc
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeAuditResultController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeAuditResultController.java
index a0524c1b48..cbdac3f133 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeAuditResultController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeAuditResultController.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CodeAuditResultDTO;
 import com.epmet.service.CodeAuditResultService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ import java.util.Map;
 
 
 /**
- * 代码审核j结果 
+ * 代码审核j结果
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -41,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("codeauditresult")
 public class CodeAuditResultController {
-    
+
     @Autowired
     private CodeAuditResultService codeAuditResultService;
 
@@ -81,4 +81,4 @@ public class CodeAuditResultController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
index c7457e048f..3d9953b78a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
@@ -6,7 +6,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.CodeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -255,7 +254,7 @@ public class CodeController {
 	 * 获取代码草稿列表
 	 * @author zhaoqifeng
 	 * @date 2020/10/28 9:59
-	 * @param 
+	 * @param
 	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.TemplateDraftListResultDTO>>
 	 */
 	@PostMapping("gettemplatedraftlist")
@@ -280,7 +279,7 @@ public class CodeController {
 	/**
 	 * 删除指定代码模板
 	 * @author zhaoqifeng
-	 * @date 2020/10/28 10:03 
+	 * @date 2020/10/28 10:03
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 */
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeCustomerController.java
index d4a193821c..1308df1896 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeCustomerController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeCustomerController.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CodeCustomerDTO;
 import com.epmet.service.CodeCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ import java.util.Map;
 
 
 /**
- * 客户代码关联表 
+ * 客户代码关联表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -41,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("codecustomer")
 public class CodeCustomerController {
-    
+
     @Autowired
     private CodeCustomerService codeCustomerService;
 
@@ -81,4 +81,4 @@ public class CodeCustomerController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeMediaController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeMediaController.java
index c8ad829979..cf791ca0b9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeMediaController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeMediaController.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CodeMediaDTO;
 import com.epmet.service.CodeMediaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ import java.util.Map;
 
 
 /**
- * 代码素材 
+ * 代码素材
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -41,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("codemedia")
 public class CodeMediaController {
-    
+
     @Autowired
     private CodeMediaService codeMediaService;
 
@@ -81,4 +81,4 @@ public class CodeMediaController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeOperationHistoryController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeOperationHistoryController.java
index 4a7fb08c98..c838359ac5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeOperationHistoryController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeOperationHistoryController.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CodeOperationHistoryDTO;
 import com.epmet.service.CodeOperationHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ import java.util.Map;
 
 
 /**
- * 客户代码操作历史 
+ * 客户代码操作历史
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -41,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("codeoperationhistory")
 public class CodeOperationHistoryController {
-    
+
     @Autowired
     private CodeOperationHistoryService codeOperationHistoryService;
 
@@ -81,4 +81,4 @@ public class CodeOperationHistoryController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java
index 59df638da9..231cb7bd5d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java
@@ -3,7 +3,9 @@ package com.epmet.controller;
 import com.epmet.service.ComponentVerifyTicketService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerAgencyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerAgencyController.java
index f459d78524..ef1609a589 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerAgencyController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerAgencyController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.PaCustomerAgencyDTO;
 import com.epmet.excel.PaCustomerAgencyExcel;
 import com.epmet.service.PaCustomerAgencyService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("pacustomeragency")
 public class PaCustomerAgencyController {
-    
+
     @Autowired
     private PaCustomerAgencyService paCustomerAgencyService;
 
@@ -91,4 +91,4 @@ public class PaCustomerAgencyController {
         ExcelUtils.exportExcelToTarget(response, null, list, PaCustomerAgencyExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
index cdaf52b710..894f052767 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
@@ -9,7 +9,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.service.*;
+import com.epmet.service.PaCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerUserAgencyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerUserAgencyController.java
index 9906427507..64304019e1 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerUserAgencyController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerUserAgencyController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.PaCustomerUserAgencyDTO;
 import com.epmet.excel.PaCustomerUserAgencyExcel;
 import com.epmet.service.PaCustomerUserAgencyService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("pacustomeruseragency")
 public class PaCustomerUserAgencyController {
-    
+
     @Autowired
     private PaCustomerUserAgencyService paCustomerUserAgencyService;
 
@@ -91,4 +91,4 @@ public class PaCustomerUserAgencyController {
         ExcelUtils.exportExcelToTarget(response, null, list, PaCustomerUserAgencyExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserWechatController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserWechatController.java
index 6a44a17cf7..c45fcccb94 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserWechatController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaUserWechatController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.PaUserWechatDTO;
 import com.epmet.excel.PaUserWechatExcel;
 import com.epmet.service.PaUserWechatService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("pauserwechat")
 public class PaUserWechatController {
-    
+
     @Autowired
     private PaUserWechatService paUserWechatService;
 
@@ -91,4 +91,4 @@ public class PaUserWechatController {
         ExcelUtils.exportExcelToTarget(response, null, list, PaUserWechatExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
index 9eb8bd06bb..d345688b3d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -1,11 +1,11 @@
 package com.epmet.controller;
 
-import com.epmet.dto.form.UploadFileFormDTO;
-import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.form.UploadFileFormDTO;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/TestConttroller.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/TestConttroller.java
index f5d81f987d..8d314fabbd 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/TestConttroller.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/TestConttroller.java
@@ -3,7 +3,6 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ComponentAccessTokenFormDTO;
 import com.epmet.service.ComponentVerifyTicketService;
-import com.epmet.service.PrivateEpmetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java
index 36e2ee3d5e..bacb67e3cf 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java
@@ -5,7 +5,9 @@ import com.epmet.constant.ModuleConstant;
 import com.epmet.service.ComponentVerifyTicketService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author zxc
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
index e7ba21153c..23606f3b2a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java
@@ -19,11 +19,11 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CodeCustomerDTO;
+import com.epmet.dto.form.CodeAuditRecordFormDTO;
 import com.epmet.dto.form.UploadListFormDTO;
 import com.epmet.dto.result.DingResultDTO;
-import com.epmet.dto.result.UploadListResultDTO;
-import com.epmet.dto.form.CodeAuditRecordFormDTO;
 import com.epmet.dto.result.TemplateAndAppIdResultDTO;
+import com.epmet.dto.result.UploadListResultDTO;
 import com.epmet.entity.CodeCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -153,4 +153,4 @@ public interface CodeCustomerDao extends BaseDao<CodeCustomerEntity> {
 	 * @Author zxc
 	 */
 	DingResultDTO selectCustomerNameAndVersion(@Param("customerId") String customerId, @Param("clientType") String clientType);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
index 85a5bac687..86deb50d31 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
@@ -22,8 +22,6 @@ import com.epmet.dto.form.ComponentAccessTokenFormDTO;
 import com.epmet.entity.ComponentAccessTokenEntity;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 /**
  * 第三方平台调用凭证
  *
@@ -78,4 +76,4 @@ public interface ComponentAccessTokenDao extends BaseDao<ComponentAccessTokenEnt
     **/
     String selectComponentAccessToken();
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java
index 0e5243e6e7..e1228c5b49 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java
@@ -27,7 +27,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * 客户小程序关系表
@@ -132,4 +131,4 @@ public interface CustomerMpDao extends BaseDao<CustomerMpEntity> {
      * @Description 修改customer_mp表客户Id
      **/
     int updateCustomerId(ModifyCustomerFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java
index 00913eac71..29a9d522e2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/OpenPlatformAccountDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.CreateOpenFormDTO;
-import com.epmet.dto.result.CreateOpenResultDTO;
 import com.epmet.entity.OpenPlatformAccountEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -54,5 +53,5 @@ public interface OpenPlatformAccountDao extends BaseDao<OpenPlatformAccountEntit
      * @author zxc
      */
     String selectOpenAppIdByCustomerId(@Param("customerId")String customerId);
-	
-}
\ No newline at end of file
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaInfoDao.java
index f605e6a7d3..6c280450b5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaInfoDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaInfoDao.java
@@ -21,10 +21,9 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.PaInfoFormDTO;
 import com.epmet.entity.PaInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
- * 公众号信息表 
+ * 公众号信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-13
@@ -39,4 +38,4 @@ public interface PaInfoDao extends BaseDao<PaInfoEntity> {
      */
     void insertPaInfo(PaInfoFormDTO formDTO);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java
index c13d107b02..eb78503ed8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.PaUserDTO;
-import com.epmet.dto.form.CheckPaUserFormDTO;
 import com.epmet.dto.form.CustomerManagerFormDTO;
 import com.epmet.entity.PaUserEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -67,4 +66,4 @@ public interface PaUserDao extends BaseDao<PaUserEntity> {
      * @date 2020/8/3 5:21 下午
      */
     CustomerManagerFormDTO selectManagerInfo(@Param("userId") String userId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PersonalTemplateDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PersonalTemplateDao.java
index 054712bea0..8156841ad4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PersonalTemplateDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PersonalTemplateDao.java
@@ -22,7 +22,10 @@ import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
 import com.epmet.dto.form.TemplateListV2FormDTO;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CustomerTemplateListResultDTO;
+import com.epmet.dto.result.GetTemplateListResultDTO;
+import com.epmet.dto.result.TemplateDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PublicTemplateDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PublicTemplateDao.java
index b51596e20e..b3a5fcd31c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PublicTemplateDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PublicTemplateDao.java
@@ -22,12 +22,11 @@ import com.epmet.dto.form.PubTemplateFormDTO;
 import com.epmet.dto.result.PubTemplateResultDTO;
 import com.epmet.entity.PublicTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-11
@@ -53,4 +52,4 @@ public interface PublicTemplateDao extends BaseDao<PublicTemplateEntity> {
 	 */
 	List<PubTemplateResultDTO> getPubTempList(PubTemplateFormDTO dto);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthCodeEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthCodeEntity.java
index 3ab4b6607d..19286fe822 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthCodeEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthCodeEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthResultRecordEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthResultRecordEntity.java
index c9fd91b40f..20ffc4122d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthResultRecordEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthResultRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 授权结果记录表 
+ * 授权结果记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-15
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthorizationInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthorizationInfoEntity.java
index 372c8265b6..9d858a854c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthorizationInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/AuthorizationInfoEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BindingAccountEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BindingAccountEntity.java
index bf30343ad0..182b706681 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BindingAccountEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BindingAccountEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  公众号/小程序绑定开放平台帐号表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BusinessInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BusinessInfoEntity.java
index 7f49030d68..9ddf48668a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BusinessInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/BusinessInfoEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 功能开通状况表 
+ * 功能开通状况表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-14
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditRecordEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditRecordEntity.java
index 2f75ae13cb..150197f58b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditRecordEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 代码审核记录表 
+ * 代码审核记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-15
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
index 488fa876a0..0da25fbe1b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 代码审核j结果 
+ * 代码审核j结果
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java
index a88d330ff1..b69eb72867 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 客户代码关联表 
+ * 客户代码关联表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeExtEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeExtEntity.java
index 8be3f7bb34..a86f454b18 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeExtEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeExtEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 代码第三方配置 
+ * 代码第三方配置
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-17
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeMediaEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeMediaEntity.java
index 51202ed323..be27a9f2c4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeMediaEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeMediaEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 代码素材 
+ * 代码素材
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java
index 08ea501e7d..7ff58780f5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 客户代码操作历史 
+ * 客户代码操作历史
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentAccessTokenEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentAccessTokenEntity.java
index c2b35c1cd4..9807e49941 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentAccessTokenEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentAccessTokenEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentVerifyTicketEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentVerifyTicketEntity.java
index f11ad037e9..2916c815a0 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentVerifyTicketEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ComponentVerifyTicketEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 微信发送的ticket表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java
index dcd1dbe613..a45338bd4b 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户小程序关系表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FixationAppIdEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FixationAppIdEntity.java
index 4d7a70e7e8..fd632cc1da 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FixationAppIdEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FixationAppIdEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 固定的AppId表 
+ * 固定的AppId表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-03
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FuncInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FuncInfoEntity.java
index 409174b938..78d43a8d94 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FuncInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/FuncInfoEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 授权给开发者的权限集列表	
+ * 授权给开发者的权限集列表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-14
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MessagePushTextEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MessagePushTextEntity.java
index 2c22ad097d..c4271c5327 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MessagePushTextEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MessagePushTextEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- *  
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-28
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniCategoryInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniCategoryInfoEntity.java
index 4ba976c442..27ac12b6e6 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniCategoryInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniCategoryInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小程序配置类目信息表 小程序配置类目信息表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniInfoEntity.java
index b45f524a0b..fa29ef2d47 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  小程序信息表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniNetworkInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniNetworkInfoEntity.java
index e873f52ecb..1e65868d70 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniNetworkInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MiniNetworkInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小程序配置合法域名信息表 小程序配置合法域名信息表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/OpenPlatformAccountEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/OpenPlatformAccountEntity.java
index 892de984ac..38a79929ff 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/OpenPlatformAccountEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/OpenPlatformAccountEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  开放平台账号表
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerAgencyEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerAgencyEntity.java
index 7b52b8ec2b..762212ed12 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerAgencyEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerAgencyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户根组织信息
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java
index d2731cf9bd..3d9a7abef4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户信息
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerUserAgencyEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerUserAgencyEntity.java
index 4f0c90ddfe..f2dfbc00ba 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerUserAgencyEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerUserAgencyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户组织关系表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaInfoEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaInfoEntity.java
index 7968591b02..7a524bc1d8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaInfoEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaInfoEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 公众号信息表 
+ * 公众号信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-14
@@ -82,7 +79,7 @@ public class PaInfoEntity extends BaseEpmetEntity {
 	private String userName;
 
     /**
-     * 主体名称 
+     * 主体名称
      */
 	private String principalName;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java
index 05ec73a6f2..7a07aafb3d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 公众号用户信息
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java
index 0aae0e2548..d8dc4b43f0 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 公众号登陆记录表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserWechatEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserWechatEntity.java
index c618051cb8..d549b876da 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserWechatEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserWechatEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 公众号用户信息
  *
@@ -49,7 +46,7 @@ public class PaUserWechatEntity extends BaseEpmetEntity {
 	private String wxOpenId;
 
     /**
-     * 
+     *
      */
 	private String unionId;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PersonalTemplateEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PersonalTemplateEntity.java
index 022c2982a5..414c3dfe99 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PersonalTemplateEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PersonalTemplateEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-09
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PreAuthTokenEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PreAuthTokenEntity.java
index 90ee22dd33..3f2ea02b52 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PreAuthTokenEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PreAuthTokenEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -44,7 +43,7 @@ public class PreAuthTokenEntity extends BaseEpmetEntity {
 	private String preAuthToken;
 
     /**
-     * 预授权码有效期  
+     * 预授权码有效期
      */
 	private Date expiresInTime;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PublicTemplateEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PublicTemplateEntity.java
index 62cac50b92..5a1c186d0e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PublicTemplateEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PublicTemplateEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-11
@@ -39,22 +36,22 @@ public class PublicTemplateEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String tid;
 
     /**
-     * 
+     *
      */
 	private String title;
 
     /**
-     * 
+     *
      */
 	private String type;
 
     /**
-     * 
+     *
      */
 	private String categoryId;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
index 97283b9c05..491b3dbcf4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformActionEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-15
@@ -39,12 +36,12 @@ public class ThirdplatformActionEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String platformId;
 
     /**
-     * 
+     *
      */
 	private String actionKey;
 	private String apiUrl;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java
index 8be40a1a0b..194438df23 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerActionEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户针对指定操作所选用的第三方平台列表
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
index 8f19691433..4e01f09a0f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformCustomerRegisterEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-15
@@ -39,12 +36,12 @@ public class ThirdplatformCustomerRegisterEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String customerId;
 
     /**
-     * 
+     *
      */
 	private String platformId;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
index d5b20b8eab..ecb156e714 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/ThirdplatformEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-15
@@ -49,7 +46,7 @@ public class ThirdplatformEntity extends BaseEpmetEntity {
 	private String platformKey;
 
     /**
-     * 
+     *
      */
 	private String platformSecret;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java
index 666b4c5b2b..3f61a2b538 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java
@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 /**
  * @Author zxc
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
index ce6c0cd3a2..a12ba80954 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java
@@ -1,9 +1,9 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.UploadFileFormDTO;
-import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.form.UploadFileFormDTO;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.result.UploadFileResultDTO;
 
 /**
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SubscribeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SubscribeService.java
index 6790a2aa15..8f3da2f27f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SubscribeService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SubscribeService.java
@@ -2,7 +2,10 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CustomerTempResultDTO;
+import com.epmet.dto.result.GetTemplateResultDTO;
+import com.epmet.dto.result.KeyWordsResultDTO;
+import com.epmet.dto.result.SubscribeCategoryResultDTO;
 
 import java.util.List;
 
@@ -105,7 +108,7 @@ public interface SubscribeService {
 	/**
 	 * 同步单一模板到所有客户
 	 * @author zhaoqifeng
-	 * @date 2021/1/11 14:49 
+	 * @date 2021/1/11 14:49
 	 * @param formDTO
 	 * @return void
 	 */
@@ -114,7 +117,7 @@ public interface SubscribeService {
 	/**
 	 * 删除客户模板
 	 * @author zhaoqifeng
-	 * @date 2021/1/11 14:54 
+	 * @date 2021/1/11 14:54
 	 * @param formDTO
 	 * @return void
 	 */
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
index 33224b3497..10fd114b33 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ThirdPlatformService.java
@@ -2,9 +2,9 @@ package com.epmet.service;
 
 import com.epmet.dto.ThirdPlatformDTO;
 import com.epmet.dto.form.CustomerFormDTO;
-import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.form.PlatformRegisterFormDTO;
 import com.epmet.dto.form.PlatformUnregisterFormDTO;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdPlatformActionsResultDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java
index c648097ab2..30a9a4ddf7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java
@@ -13,7 +13,6 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.mq.producer.BlockChainProducer;
-import com.epmet.mq.properties.RocketMQProperties;
 import com.epmet.service.BlockChainProjectService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,16 +32,16 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
 
     @Autowired
     private BlockChainProducer blockChainProducer;
-    
+
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
-    
+
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
-    
+
     @Autowired
     private EpmetUserOpenFeignClient userOpenFeignClient;
-    
+
     @Override
     public void blockChainCreateProject(BlockChainCreateProjectFormDTO input) {
 
@@ -66,11 +65,11 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
      * @param project
      * @param process
      */
-    private void fill(BlockChainProjectFormDTO project, BlockChainProjectProcessFormDTO process, 
+    private void fill(BlockChainProjectFormDTO project, BlockChainProjectProcessFormDTO process,
                       List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs, BlockChainProjectProcessAssignedStaffFormDTO handledStaff) {
-        
+
         // 一.填充project信息
-        
+
         if (project != null) {
             // 客户信息
             CustomerDTO customerDTO = new CustomerDTO();
@@ -92,16 +91,16 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
             project.setAgencyName(agencyInfo.getOrganizationName());
             Optional.of(staffInfo).ifPresent((staff) -> project.setCreaterName(staff.getRealName()));
         }
-        
+
         // 二.填充进展信息
-        
+
         if (process != null) {
-            
+
             if (StringUtils.isNotBlank(process.getAgencyId())) {
                 // 组织信息
                 CustomerAgencyDTO processAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(process.getAgencyId()),
                         ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败", null);
-                
+
                 process.setAgencyName(processAgencyInfo.getOrganizationName());
             }
 
@@ -111,7 +110,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
                 processGridFormDTO.setGridId(process.getGridId());
                 CustomerGridDTO processGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(processGridFormDTO),
                         ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败", null);
-                
+
                 Optional.of(processGridInfo).ifPresent((grid) -> process.setGridName(grid.getGridName()));
             }
 
@@ -125,14 +124,14 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
             process.setCreatedBy(processStaffInfo.getRealName());
 
         }
-        
+
         // 三.填充指派用户信息
         if (assignedStaffs != null) {
             for (BlockChainProjectProcessAssignedStaffFormDTO assignedStaff : assignedStaffs) {
                 fillAssignedStaffInfo(assignedStaff);
             }
         }
-        
+
         // 4.填充当前处理人信息
         if (handledStaff != null) {
             fillAssignedStaffInfo(handledStaff);
@@ -188,7 +187,7 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
         BlockChainProjectProcessAssignedStaffFormDTO handledStaff = input.getHandledStaff();
 
         fill(project, process, assignedStaffs, handledStaff);
-        
+
         String processString = JSON.toJSONString(process);
         blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString);
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java
index 534aba66b4..ef697f1ea2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CodeAuditResultDao;
 import com.epmet.dto.CodeAuditResultDTO;
 import com.epmet.entity.CodeAuditResultEntity;
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 代码审核j结果 
+ * 代码审核j结果
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -111,4 +111,4 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl<CodeAuditResultD
         return baseDao.selectAuditFailedList(customerId, clientType);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java
index 02de9c657a..17502191b0 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CodeCustomerDao;
 import com.epmet.dto.CodeCustomerDTO;
 import com.epmet.dto.form.UploadListFormDTO;
@@ -156,4 +156,4 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl<CodeCustomerDao, Co
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeExtServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeExtServiceImpl.java
index f3fceb0436..608c2e1a76 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeExtServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeExtServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CodeExtDao;
 import com.epmet.dto.CodeExtDTO;
 import com.epmet.entity.CodeExtEntity;
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 代码第三方配置 
+ * 代码第三方配置
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-17
@@ -111,4 +111,4 @@ public class CodeExtServiceImpl extends BaseServiceImpl<CodeExtDao, CodeExtEntit
         return baseDao.selectExtByCustomerId(customerId, clientType);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeMediaServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeMediaServiceImpl.java
index 4447d8ed66..fdcc8bb1a7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeMediaServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeMediaServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CodeMediaDao;
 import com.epmet.dto.CodeMediaDTO;
 import com.epmet.entity.CodeMediaEntity;
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 代码素材 
+ * 代码素材
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -101,4 +101,4 @@ public class CodeMediaServiceImpl extends BaseServiceImpl<CodeMediaDao, CodeMedi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java
index c50199c644..6625ad05bd 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CodeOperationHistoryDao;
 import com.epmet.dto.CodeOperationHistoryDTO;
 import com.epmet.dto.result.CodeHistoryResultDTO;
@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 客户代码操作历史 
+ * 客户代码操作历史
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-09
@@ -112,4 +112,4 @@ public class CodeOperationHistoryServiceImpl extends BaseServiceImpl<CodeOperati
         baseDao.updateDescribeByCodeId(codeId, describe);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerAgencyServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerAgencyServiceImpl.java
index f3301377d0..ebbf107ea9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerAgencyServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerAgencyServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.PaCustomerAgencyDao;
 import com.epmet.dto.PaCustomerAgencyDTO;
 import com.epmet.entity.PaCustomerAgencyEntity;
@@ -101,4 +101,4 @@ public class PaCustomerAgencyServiceImpl extends BaseServiceImpl<PaCustomerAgenc
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerUserAgencyServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerUserAgencyServiceImpl.java
index 3ddecf4123..ad26af0a50 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerUserAgencyServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerUserAgencyServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.PaCustomerUserAgencyDao;
 import com.epmet.dto.PaCustomerUserAgencyDTO;
 import com.epmet.entity.PaCustomerUserAgencyEntity;
@@ -101,4 +101,4 @@ public class PaCustomerUserAgencyServiceImpl extends BaseServiceImpl<PaCustomerU
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java
index 0820b359d4..f2d0aa55cd 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserWechatServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.PaUserWechatDao;
 import com.epmet.dto.PaUserWechatDTO;
 import com.epmet.entity.PaUserWechatEntity;
@@ -112,4 +112,4 @@ public class PaUserWechatServiceImpl extends BaseServiceImpl<PaUserWechatDao, Pa
         return baseDao.selectWechatByOpenId(openId, source);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PrivateEpmetServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PrivateEpmetServiceImpl.java
index 35cb59cad1..dddad10bf4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PrivateEpmetServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PrivateEpmetServiceImpl.java
@@ -1,17 +1,13 @@
 package com.epmet.service.impl;
 
-import com.epmet.constant.ThirdRunTimeInfoConstant;
 import com.epmet.dao.AuthorizationInfoDao;
 import com.epmet.dao.ComponentAccessTokenDao;
 import com.epmet.dao.ComponentVerifyTicketDao;
-import com.epmet.dto.form.AuthorizationInfoFormDTO;
 import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
 import com.epmet.dto.form.ComponentAccessTokenFormDTO;
-import com.epmet.dto.result.AuthorizationInfoResultDTO;
 import com.epmet.redis.RedisThird;
 import com.epmet.service.PrivateEpmetService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index dddf8a9909..8a8cde1f45 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -1,10 +1,10 @@
 package com.epmet.service.impl;
 
 import com.epmet.apiservice.ApiService;
-import com.epmet.dto.form.UploadFileFormDTO;
-import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.form.UploadFileFormDTO;
+import com.epmet.dto.result.ProjectAssistResult;
 import com.epmet.dto.result.UploadFileResultDTO;
 import com.epmet.service.ApiServiceSelector;
 import com.epmet.service.ProjectService;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
index a3e0930e7a..34f7ec9c31 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ThirdPlatformServiceImpl.java
@@ -9,9 +9,9 @@ import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
 import com.epmet.dto.ThirdPlatformDTO;
 import com.epmet.dto.form.CustomerFormDTO;
-import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.form.PlatformRegisterFormDTO;
 import com.epmet.dto.form.PlatformUnregisterFormDTO;
+import com.epmet.dto.form.ThirdPlatformFormDTO;
 import com.epmet.dto.result.ThirdPlatformActionsResultDTO;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.entity.ThirdplatformCustomerActionEntity;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
index c85d5d2a43..7308a48ed2 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@@ -12,7 +12,10 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.ThirdRedisKeyConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
-import com.epmet.dao.*;
+import com.epmet.dao.CodeAuditRecordDao;
+import com.epmet.dao.CodeAuditResultDao;
+import com.epmet.dao.CodeCustomerDao;
+import com.epmet.dao.MiniInfoDao;
 import com.epmet.dto.form.CodeAuditRecordFormDTO;
 import com.epmet.dto.form.MessagePushTextFormDTO;
 import com.epmet.dto.result.AuthorizationInfoResultDTO;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaNewsReq.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaNewsReq.java
index b0cc794400..0d8bbbaefa 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaNewsReq.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaNewsReq.java
@@ -1,7 +1,6 @@
 package com.epmet.wxapi.param;
 
 import com.google.gson.annotations.SerializedName;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java
index adc88ce88b..08399c7488 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java
@@ -3,7 +3,6 @@ package com.epmet.wxapi.result;
 import com.epmet.dto.result.AccountBasicInfoResultDTO;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaNewsResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaNewsResult.java
index 7bce05e30a..89963dc1e4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaNewsResult.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaNewsResult.java
@@ -2,7 +2,6 @@ package com.epmet.wxapi.result;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxLoginService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxLoginService.java
index 457f53af08..44cb98e22c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxLoginService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxLoginService.java
@@ -2,8 +2,6 @@ package com.epmet.wxapi.service;
 
 import com.epmet.dto.UserWechatDTO;
 
-import java.util.HashMap;
-
 /**
  * 小程序代码管理相关 API（微信登陆）
  * 文档：https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1489140610_Uavc4&token=&lang=zh_CN
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaSettingService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaSettingService.java
index f0088e5136..c7c8a8f6a9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaSettingService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaSettingService.java
@@ -3,8 +3,6 @@ package com.epmet.wxapi.service;
 import com.epmet.wxapi.param.*;
 import com.epmet.wxapi.result.*;
 
-import java.util.List;
-
 /**
  * 小程序修改服务器地址、类目管理、成员管理 API（大部分只能是第三方平台调用）
  *
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaSettingServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaSettingServiceImpl.java
index fc3719ac1e..fab04eda4e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaSettingServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaSettingServiceImpl.java
@@ -15,8 +15,6 @@ import com.google.gson.GsonBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author zhaoqifeng
  * @dscription
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovCustomerMenuDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovCustomerMenuDTO.java
index 93d5e9c66e..f35a12df45 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovCustomerMenuDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovCustomerMenuDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class GovCustomerMenuDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/IcOftenUseFunctionDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/IcOftenUseFunctionDTO.java
index 83e458ceb6..f4558642c2 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/IcOftenUseFunctionDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/IcOftenUseFunctionDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class IcOftenUseFunctionDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -88,4 +89,4 @@ public class IcOftenUseFunctionDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/OperationScopeDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/OperationScopeDTO.java
index 35885d7f8c..b01fd1011f 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/OperationScopeDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/OperationScopeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class OperationScopeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java
index 2ac1638384..d76bcdcfa9 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class RoleScopeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -88,4 +89,4 @@ public class RoleScopeDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java
index 657cb271f0..e87140d602 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
index 86dad3a7a3..e62e9f9485 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuFormDTO.java
index 83149065c5..7ea77ded26 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuFormDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 菜单基础入参
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/PackageAddOftenUseFunctionFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/PackageAddOftenUseFunctionFormDTO.java
index f34c326b3d..0b8f1e91c3 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/PackageAddOftenUseFunctionFormDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/PackageAddOftenUseFunctionFormDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
index 6961dad6ca..aa5baff3a7 100755
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.result;
 
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 
 /**
  * 角色默认的可操作功能列表
@@ -33,7 +34,7 @@ public class RoleOperationDefaultResultDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -57,4 +58,4 @@ public class RoleOperationDefaultResultDTO implements Serializable {
      */
     private Boolean assigned;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java
index 9f092331ad..3bf8d2f111 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java
@@ -6,7 +6,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
 import com.epmet.feign.GovAccessFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.Set;
 
@@ -27,4 +26,4 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
     public Result<Set<String>> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
index 0c01badca0..ceed474e4c 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
@@ -8,7 +8,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.PostConstruct;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Configuration
 public class PermissionInitializer {
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java
index dad8f7e095..0345f9582f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java
@@ -2,10 +2,15 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.*;
+import com.epmet.dto.form.GetSQLFilterFormDTO;
+import com.epmet.dto.form.HasSpecifiedPermissionFormDTO;
+import com.epmet.dto.form.ListOpePermsFormDTO;
 import com.epmet.service.AccessService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Set;
 
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovCustomerMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovCustomerMenuController.java
index 77d498fb37..e76ebc405f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovCustomerMenuController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovCustomerMenuController.java
@@ -24,8 +24,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.GovCustomerMenuDTO;
 import com.epmet.dto.form.MenuConfigFormDTO;
 import com.epmet.dto.form.MenuFormDTO;
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java
index 6d89deab21..2b2cb8e217 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java
@@ -4,16 +4,15 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.dto.IcOftenUseFunctionDTO;
 import com.epmet.dto.form.AddOftenUseFunctionFormDTO;
 import com.epmet.dto.form.PackageAddOftenUseFunctionFormDTO;
 import com.epmet.dto.result.OftenUseFunctionListResultDTO;
 import com.epmet.service.IcOftenUseFunctionService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -26,7 +25,7 @@ import java.util.List;
 @RestController
 @RequestMapping("icoftenusefunction")
 public class IcOftenUseFunctionController {
-    
+
     @Autowired
     private IcOftenUseFunctionService icOftenUseFunctionService;
 
@@ -56,4 +55,4 @@ public class IcOftenUseFunctionController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDao.java
index 98a455f052..b89600da15 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDao.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDao.java
@@ -22,7 +22,6 @@ import com.epmet.dto.result.RoleOpeScopeResultDTO;
 import com.epmet.entity.OperationScopeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.context.annotation.Scope;
 
 import java.util.List;
 import java.util.Set;
@@ -54,4 +53,4 @@ public interface OperationScopeDao extends BaseDao<OperationScopeEntity> {
     String getDefaultScopeKeyForOperation(@Param("operationKey") String operationKey);
 
     String getScopeIndexByScopeKey(@Param("scopeKey") String scopeKey);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
index 19ccbf901e..377da8d2a1 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
@@ -18,13 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.entity.RoleOperationDefaultEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -54,4 +52,4 @@ public interface RoleOperationDefaultDao extends BaseDao<RoleOperationDefaultEnt
     int deleteByRoleKeyAndOpeKey(
             @Param("roleKey") String roleKey,
             @Param("operationKey") String operationKey);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovCustomerMenuEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovCustomerMenuEntity.java
index d0358e7124..f0ab57887f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovCustomerMenuEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovCustomerMenuEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户菜单配置表
  *
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/IcOftenUseFunctionEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/IcOftenUseFunctionEntity.java
index 9c0e1cf9f0..a3500559ec 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/IcOftenUseFunctionEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/IcOftenUseFunctionEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 常用功能
  *
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
index e599d8c28f..d6a48311e7 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 操作类型表
  *
@@ -39,12 +36,12 @@ public class OperationEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String operationKey;
 
     /**
-     * 
+     *
      */
 	private String operationName;
 
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
index 6ec89eb12b..3e7cee1553 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 默认操作范围表
  *
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeEntity.java
index 2c7223d97d..1821421856 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 权限范围表
  *
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java
index 24bef0d80b..db1050a7cd 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 角色能进行那些操作
  *
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java
index 2ee49f8ede..88c968a38b 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 角色能操作哪些范围
  *
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index f418de95e0..b14760fd76 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -4,14 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description
  * @Author sun
@@ -28,4 +23,4 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     public Result<CustomerAgencyDTO> getAgencyByStaff(String staffId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaff", staffId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java
index 8d0c15b59c..e95f2ab8b4 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java
@@ -19,7 +19,6 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dto.IcOftenUseFunctionDTO;
 import com.epmet.dto.form.AddOftenUseFunctionFormDTO;
 import com.epmet.dto.result.OftenUseFunctionListResultDTO;
 import com.epmet.entity.IcOftenUseFunctionEntity;
@@ -50,4 +49,4 @@ public interface IcOftenUseFunctionService extends BaseService<IcOftenUseFunctio
      * @date 2022/1/17 10:13 上午
      */
     void addOftenUseFunction(List<AddOftenUseFunctionFormDTO> formDTOS, TokenDto tokenDto);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
index 05763d0062..3916065000 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.*;
+import com.epmet.dao.OperationScopeDefaultDao;
+import com.epmet.dao.RoleOperationDao;
+import com.epmet.dao.RoleOperationDefaultDao;
+import com.epmet.dao.RoleScopeDao;
 import com.epmet.dto.form.AccessConfigAdd4RoletFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.OperationScopeDefaultEntity;
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java
index f12a56feef..e2e16a9799 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcOftenUseFunctionDao;
-import com.epmet.dto.IcOftenUseFunctionDTO;
 import com.epmet.dto.form.AddOftenUseFunctionFormDTO;
 import com.epmet.dto.result.OftenUseFunctionListResultDTO;
 import com.epmet.entity.IcOftenUseFunctionEntity;
@@ -78,4 +77,4 @@ public class IcOftenUseFunctionServiceImpl extends BaseServiceImpl<IcOftenUseFun
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java
index e582395fe2..ce298540ef 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationScopeServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperationScopeDao;
 import com.epmet.dto.OperationScopeDTO;
 import com.epmet.entity.OperationScopeEntity;
 import com.epmet.service.OperationScopeService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -98,4 +97,4 @@ public class OperationScopeServiceImpl extends BaseServiceImpl<OperationScopeDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
index 393bfdb12f..fd6d454a71 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperationScopeDefaultDao;
 import com.epmet.dao.RoleOperationDao;
 import com.epmet.dao.RoleOperationDefaultDao;
@@ -219,4 +219,4 @@ public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao,
         return map;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java
index bff52f8d64..c4173d64c5 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleScopeServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.RoleScopeDao;
 import com.epmet.dto.RoleScopeDTO;
 import com.epmet.entity.RoleScopeEntity;
 import com.epmet.service.RoleScopeService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -97,4 +96,4 @@ public class RoleScopeServiceImpl extends BaseServiceImpl<RoleScopeDao, RoleScop
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java
index 99ba370525..7abb76a1e9 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java
@@ -2,7 +2,6 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.annotation.ExternalRequestAuth;
 import com.epmet.service.TestService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
index 7324243e89..4c2ebf5564 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 党员认证-审核历史列表f返参
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
index 21733fe9fb..b4a5a47373 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 党员认证-待审核列表返参
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
index 444b81dc02..18f728b698 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
@@ -4,8 +4,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
-import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
 import com.epmet.resi.group.dto.topic.form.AllMessagesFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index bfb238d29a..201dbab0d9 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -3,10 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -24,4 +21,4 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getMyGrids", userId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index 413022ea78..11bd464a7f 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -11,10 +11,8 @@ import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
 import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
-import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
index 3a04d1c64b..ff6047d4f4 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
@@ -1,19 +1,14 @@
 package com.epmet.service;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
 import com.epmet.dto.form.CertifiedDetailFormDTO;
 import com.epmet.dto.form.CertifiedFormDTO;
-import com.epmet.dto.result.CertifiedDetailResultDTO;
-import com.epmet.dto.result.CertifiedResultDTO;
-
-import java.util.List;
 import com.epmet.dto.result.AuditedPartyMemberResultDTO;
 import com.epmet.dto.result.AuditingPartyMemberResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.epmet.dto.result.CertifiedDetailResultDTO;
+import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO;
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java
index fd33177b01..08a9526ac0 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class IssueCategoryDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
index 1d713b3b12..9c5061054b 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IssueCustomerParameterDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
index 4b89f406df..a116c010d6 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class IssueProcessDTO implements Serializable {
 	 */
 	private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
index 0bbe068ff0..00886e736f 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class IssueProjectRelationDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java
index b07cf0042e..8f7cf42add 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class IssueProjectTagDictDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
index 9b6497af48..2fb6eae6f7 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class IssueSatisfactionDetailDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
index 0580fef1c8..fe1717ce32 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IssueSatisfactionStatisticalDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueShareLinkVisitRecordDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueShareLinkVisitRecordDTO.java
index 3ed4db4260..c3703d81b9 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueShareLinkVisitRecordDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueShareLinkVisitRecordDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 议题分享链接访问记录表 
+ * 议题分享链接访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-18
@@ -34,7 +35,7 @@ public class IssueShareLinkVisitRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -98,4 +99,4 @@ public class IssueShareLinkVisitRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
index 6ca1c51c6a..02d506ce73 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IssueTagsDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
index f1ae3bca96..e1d3292b2a 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class IssueVoteDetailDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
index 565cafe7d4..22e3bc6f4d 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IssueVoteStatisticalDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
index e648ec8f50..c41ddf2e3f 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class IssueVoteStatisticalDailyDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java
index 889c042c5f..eb50dec22d 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.google.gson.internal.$Gson$Types;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAuditionFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAuditionFormDTO.java
index 1eb9b86791..6cc6885c63 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAuditionFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAuditionFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java
index 9eefc723f8..872eb43772 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MemosToRemindFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MemosToRemindFormDTO.java
index 4b5ac76740..1590c6de97 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MemosToRemindFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MemosToRemindFormDTO.java
@@ -6,7 +6,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author sun
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MyPubIssuesAuditingFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MyPubIssuesAuditingFormDTO.java
index 0ede11f11d..f637c2e29d 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MyPubIssuesAuditingFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MyPubIssuesAuditingFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
index 8941320269..7c9a491004 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationDetailResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationDetailResultDTO.java
index ef84d338e0..dfc5654cb9 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationDetailResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationDetailResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovIssueDetailResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovIssueDetailResultDTO.java
index e540f6581c..5d87d13144 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovIssueDetailResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovIssueDetailResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import lombok.Data;
-import sun.util.resources.cldr.gv.LocaleNames_gv;
 
 import java.io.Serializable;
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MemosToRemindResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MemosToRemindResultDTO.java
index 43998e8395..6885a596af 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MemosToRemindResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MemosToRemindResultDTO.java
@@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author sun
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
index 20b827a9ad..b9db284194 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
@@ -4,9 +4,6 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IssueApplicationDTO;
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java
index f3320a96b8..8317eb8ab0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java
@@ -16,7 +16,10 @@ import com.epmet.service.IssueApplicationHistoryService;
 import com.epmet.service.IssueApplicationService;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
index a9353aea01..fea0680490 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueCustomerParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
 import com.epmet.dto.result.ParameterResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("parameter")
 public class IssueCustomerParameterController {
-    
+
     @Autowired
     private IssueCustomerParameterService issueCustomerParameterService;
 
@@ -135,4 +135,4 @@ public class IssueCustomerParameterController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
index 86addc77a7..737b187ad1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProcessDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issueprocess")
 public class IssueProcessController {
-    
+
     @Autowired
     private IssueProcessService issueProcessService;
 
@@ -103,4 +103,4 @@ public class IssueProcessController {
         return new Result<List<ProcessListResultDTO>>().ok(issueProcessService.processList(issueId));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
index 279f3ef9a2..d5305eb4d9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectRelationDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.result.ProjectIdResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issueprojectrelation")
 public class IssueProjectRelationController {
-    
+
     @Autowired
     private IssueProjectRelationService issueProjectRelationService;
 
@@ -103,4 +103,4 @@ public class IssueProjectRelationController {
         return new Result<ProjectIdResultDTO>().ok(issueProjectRelationService.selectProjectId(issueId));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
index e87f9996d7..93fee887d2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectTagDictDTO;
 import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issueprojecttagdict")
 public class IssueProjectTagDictController {
-    
+
     @Autowired
     private IssueProjectTagDictService issueProjectTagDictService;
 
@@ -122,4 +122,4 @@ public class IssueProjectTagDictController {
         issueProjectTagDictService.updateTagHeat(param);
         return new Result();
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
index 4eb362bec6..e9a76102a0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
 import com.epmet.dto.form.EvaluationListFormDTO;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuesatisfactiondetail")
 public class IssueSatisfactionDetailController {
-    
+
     @Autowired
     private IssueSatisfactionDetailService issueSatisfactionDetailService;
 
@@ -127,4 +127,4 @@ public class IssueSatisfactionDetailController {
         return new Result<List<EvaluationListResultDTO>>().ok(issueSatisfactionDetailService.evaluationList(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
index f9412e0996..600d3a8174 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueSatisfactionStatisticalDTO;
 import com.epmet.excel.IssueSatisfactionStatisticalExcel;
 import com.epmet.service.IssueSatisfactionStatisticalService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuesatisfactionstatistical")
 public class IssueSatisfactionStatisticalController {
-    
+
     @Autowired
     private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService;
 
@@ -91,4 +91,4 @@ public class IssueSatisfactionStatisticalController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueShareLinkVisitRecordController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueShareLinkVisitRecordController.java
index 64f90774fb..83a2a5b65c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueShareLinkVisitRecordController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueShareLinkVisitRecordController.java
@@ -13,12 +13,11 @@ import com.epmet.service.IssueShareLinkVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 
 /**
- * 议题分享链接访问记录表 
+ * 议题分享链接访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-18
@@ -26,7 +25,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuesharelinkvisitrecord")
 public class IssueShareLinkVisitRecordController {
-    
+
     @Autowired
     private IssueShareLinkVisitRecordService issueShareLinkVisitRecordService;
 
@@ -95,4 +94,4 @@ public class IssueShareLinkVisitRecordController {
     public Result<IssueShareLinkVisitRecordDTO> visitRecord(@RequestParam("linkId")String linkId,@RequestParam("invitee")String invitee){
         return new Result<IssueShareLinkVisitRecordDTO>().ok(issueShareLinkVisitRecordService.getVisitRecord(linkId,invitee));
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
index 1b58ffddff..1598ef6479 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueVoteDetailDTO;
 import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.VoteFormDTO;
@@ -48,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuevotedetail")
 public class IssueVoteDetailController {
-    
+
     @Autowired
     private IssueVoteDetailService issueVoteDetailService;
 
@@ -115,4 +115,4 @@ public class IssueVoteDetailController {
         return new Result<JoinVoteResultDTO>().ok(issueVoteDetailService.joinVote(checkVoteFormDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
index 5265af8079..204bbd4e55 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.form.MyPartIssuesFormDTO;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
index 1d4128ace9..71ccbeb0a2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueVoteStatisticalDailyDTO;
 import com.epmet.dto.form.DailyStatisticalVoteJob;
 import com.epmet.excel.IssueVoteStatisticalDailyExcel;
@@ -46,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuevotestatisticaldaily")
 public class IssueVoteStatisticalDailyController {
-    
+
     @Autowired
     private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService;
 
@@ -105,4 +105,4 @@ public class IssueVoteStatisticalDailyController {
         issueVoteStatisticalDailyService.countVotingDailyStatisticNew(form);
         return new Result();
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
index c236ee2712..1ee96c8839 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
@@ -18,8 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.IssueProcessDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.entity.IssueProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -58,4 +58,4 @@ public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
      */
     ProcessListResultDTO issueBeginInfo(IssueIdFormDTO formDTO);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkVisitRecordDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkVisitRecordDao.java
index db7080c405..256db7c543 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkVisitRecordDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkVisitRecordDao.java
@@ -23,10 +23,8 @@ import com.epmet.entity.IssueShareLinkVisitRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
- * 议题分享链接访问记录表 
+ * 议题分享链接访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-18
@@ -64,4 +62,4 @@ public interface IssueShareLinkVisitRecordDao extends BaseDao<IssueShareLinkVisi
     IssueShareLinkVisitRecordDTO selectRecordByLinkIdAndInvitee(@Param("linkId") String linkId, @Param("invitee") String invitee);
 
     int updateIfJoinGroupByLinkId(@Param("linkId") String linkId, @Param("invitee") String invitee);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
index f0478e560f..f81fdc2b45 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题所属分类表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
index 72e7769da7..637fa8d3a2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题客户参数定制表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java
index 4c94cbd18d..fa33418bc6 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
index 3da427a48e..7bb2a512d3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题进展记录表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
index 0a05d29091..077098f8c2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题项目分类字典
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
index 0a12f9f253..9e4c748944 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题项目关系表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java
index 48d457624b..bb77e4530b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题、项目标签字典表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
index 592fdb69dc..7b2aa40748 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题满意度调查记录表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
index 1e688a7f9b..6f9fac14e3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题满意度调查统计表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueShareLinkVisitRecordEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueShareLinkVisitRecordEntity.java
index b4cea0c628..12e8906895 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueShareLinkVisitRecordEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueShareLinkVisitRecordEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 议题分享链接访问记录表 
+ * 议题分享链接访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-18
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSuggestionEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSuggestionEntity.java
index 2d160030ab..daf58002a4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSuggestionEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSuggestionEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 居民端用户对议题建议或意见表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java
index 1dc56255fc..c3899a021c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题关联标签表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
index 8556dd1c80..648b452fa1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题表决记录表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
index 181fae4e3e..5ddf057b31 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
@@ -20,7 +20,6 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
index c0c3dc8654..9a5be6aaaf 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 议题表决统计表
  *
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
index 1ebc259209..38331b5780 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
@@ -5,8 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
 import com.epmet.dto.form.ShiftProjectFormDTO;
 import com.epmet.dto.form.ShiftProjectsFromDTO;
-import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.dto.result.IssueProjectResultDTO;
+import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.dto.result.ShiftProjectResultDTO;
 import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
index 26a4e01d16..a04420bd26 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -18,8 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
-
 /**
  * @Description 调用resi-group服务
  * @Author sun
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
index d147041562..c8185fa47e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
 import com.epmet.dto.form.ShiftProjectFormDTO;
 import com.epmet.dto.form.ShiftProjectsFromDTO;
-import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.dto.result.IssueProjectResultDTO;
+import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.dto.result.ShiftProjectResultDTO;
 import com.epmet.feign.GovProjectFeignClient;
 import org.springframework.stereotype.Component;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index 93191c3b9b..7e23fa7eae 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -7,7 +7,6 @@ import com.epmet.dto.form.CheckTopicPublisherFormDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CommonGridIdListFormDTO;
 import com.epmet.dto.form.ShouldVoteCountFormDTO;
-import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.dto.result.CheckTopicPublisherResultDTO;
 import com.epmet.dto.result.GridVotableCountResultDTO;
 import com.epmet.dto.result.ShouldVoteCountResultDTO;
@@ -17,8 +16,6 @@ import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description 调用resi-group服务
  * @Author sun
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
index ff16d20238..9a5e2da482 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -5,15 +5,9 @@ import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
 import com.epmet.mq.listener.IssueProjectCategoryTagInitListener;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.MessageListener;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 public class RocketMQConsumerRegister extends MQAbstractRegister {
 
@@ -24,4 +18,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
 
         // ...其他监听器类似
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java
index 73e54adaca..b3b8a300ab 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java
@@ -23,7 +23,6 @@ import com.epmet.dto.IssueProcessDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.entity.IssueProcessEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -110,4 +109,4 @@ public interface IssueProcessService extends BaseService<IssueProcessEntity> {
      * @date 2020.05.13 16:42
     **/
     int insertOne(IssueProcessDTO issueProcessDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
index 5ebf0fc5a1..41fdfd6884 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
@@ -23,7 +23,6 @@ import com.epmet.dto.IssueProjectRelationDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.result.ProjectIdResultDTO;
 import com.epmet.entity.IssueProjectRelationEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -111,4 +110,4 @@ public interface IssueProjectRelationService extends BaseService<IssueProjectRel
      * @author zxc
      */
     ProjectIdResultDTO selectProjectId(IssueIdFormDTO issueId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index 1c8bd6c376..1296374261 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -7,8 +7,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.CommonIssueListFormDTO;
-import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.entity.IssueEntity;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueShareLinkVisitRecordService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueShareLinkVisitRecordService.java
index 2f1becfbe2..397e480283 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueShareLinkVisitRecordService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueShareLinkVisitRecordService.java
@@ -22,11 +22,12 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueShareLinkVisitRecordDTO;
 import com.epmet.dto.form.SharableIssueAndInviteeFormDTO;
 import com.epmet.entity.IssueShareLinkVisitRecordEntity;
+
 import java.util.List;
 import java.util.Map;
 
 /**
- * 议题分享链接访问记录表 
+ * 议题分享链接访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-18
@@ -110,4 +111,4 @@ public interface IssueShareLinkVisitRecordService extends BaseService<IssueShare
      * @date 2020.12.21 16:27
      */
     IssueShareLinkVisitRecordDTO getVisitRecord(String linkId,String invitee);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
index 5a1d237a20..792faefa4a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
@@ -20,14 +20,12 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueVoteDetailDTO;
-import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.SelectIssueVotingDetailFormDTO;
 import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.dto.form.VoteRedisFormDTO;
 import com.epmet.dto.result.JoinVoteResultDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -134,4 +132,4 @@ public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntit
 
     void updateVote(SelectIssueVotingDetailFormDTO formDTO);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
index 1a0f3a3cf8..a1aec7c5f1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
@@ -29,7 +29,6 @@ import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -169,4 +168,4 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
      * @date 2020/11/10 10:01 上午
      */
     List<MyPartIssuesResultDTO> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
index a699e58a61..074b7bcd39 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
@@ -37,8 +37,8 @@ import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
 import com.epmet.service.IssueApplicationService;
-import com.github.pagehelper.PageHelper;
 import com.epmet.utils.ModuleConstants;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -186,4 +186,4 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl<IssueApplicatio
         return idList;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
index 98899856cb..c22858a292 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dao.IssueCustomerParameterDao;
 import com.epmet.dto.IssueCustomerParameterDTO;
@@ -176,4 +176,4 @@ public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCust
         return baseDao.selectIssueAuditSwitchIfOpen(customerId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
index 9e3f1f034e..5e47cc5a4a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
@@ -20,10 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dao.IssueProcessDao;
@@ -169,4 +169,4 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
         return listResult;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
index c363fef421..0fb9934840 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dto.IssueProjectRelationDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
@@ -128,4 +128,4 @@ public class IssueProjectRelationServiceImpl extends BaseServiceImpl<IssueProjec
         return resultDTO;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index cbc5d8822c..7fc5f0091c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -28,7 +28,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.IssueProjectTagDictDTO;
-import com.epmet.dto.form.CategoryTagInitFormDTO;
 import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
index 0a3947a0af..99cc85eecf 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -28,7 +29,6 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.IssueConstant;
@@ -196,4 +196,4 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
         return baseDao.evaluationList(formDTO);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
index f912e4d4c9..eb1165fc2b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueSatisfactionStatisticalDao;
 import com.epmet.dto.IssueSatisfactionStatisticalDTO;
 import com.epmet.entity.IssueSatisfactionStatisticalEntity;
@@ -101,4 +101,4 @@ public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl<Iss
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java
index be578eb2aa..aea4576770 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java
@@ -33,7 +33,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index d494413fed..10b4673ce9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -39,13 +39,11 @@ import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CheckTopicPublisherResultDTO;
 import com.epmet.dto.result.JoinVoteResultDTO;
-import com.epmet.dto.result.ShouldVoteCountResultDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.service.IssueService;
 import com.epmet.service.IssueVoteDetailService;
-import com.epmet.service.IssueVoteStatisticalService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -262,4 +260,4 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
index bace75b3df..1aa03a10a3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
@@ -20,12 +20,12 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IssueVoteDetailDao;
@@ -40,7 +40,6 @@ import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.redis.IssueVoteStatisticalDailyRedis;
 import com.epmet.service.IssueVoteStatisticalDailyService;
 import com.epmet.utils.ModuleConstants;
-import oracle.sql.NUMBER;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -397,4 +396,4 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
         });
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index f8afd7bbf7..b28378b26c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -20,13 +20,13 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IssueConstant;
@@ -62,13 +62,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN;
-import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMMDD;
 
 /**
  * 议题表决统计表
diff --git a/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/GovFootBarFormDTO.java b/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/GovFootBarFormDTO.java
index 79951ec2a3..cb34b4a423 100644
--- a/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/GovFootBarFormDTO.java
+++ b/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/GovFootBarFormDTO.java
@@ -2,10 +2,8 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class GovFootBarFormDTO {
     //@NotBlank(message = "客户ID不能为空")
     private String customerId;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java
index 150e7253ab..9338caab4a 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java
@@ -1,10 +1,6 @@
 package com.epmet.config;
 
-import com.epmet.loadbalancer.EpmetRequestLoadBalancerRule;
-import com.netflix.loadbalancer.IRule;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 
 @Configuration
 public class LoadBalancerConfig {
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/AccessController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/AccessController.java
index 61944d3939..0056525340 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/AccessController.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/AccessController.java
@@ -3,7 +3,6 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.StaffOperationDTO;
 import com.epmet.service.AccessService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Set;
 
 /**
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
index 329d12ef4b..8f0f75a681 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -102,4 +101,4 @@ public class StaffAgencyController {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 87a64b8fae..eaabe43f49 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -18,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-import java.util.List;
-
 
 /**
  * @Description
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
index fba1ee780a..12a4b4e6c6 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
@@ -4,12 +4,12 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
-import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
index 38d49f3929..e677b29414 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Set;
 
 @Service
 public class AccessServiceImpl implements AccessService {
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrgParameterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrgParameterDTO.java
index 8710b66d01..68349d0604 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrgParameterDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrgParameterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -54,7 +55,7 @@ public class CustomerOrgParameterDTO implements Serializable {
 	private String parameterName;
 
     /**
-     * 参数值 eg:开启：open；关闭：closed 
+     * 参数值 eg:开启：open；关闭：closed
      */
 	private String parameterValue;
 
@@ -93,4 +94,4 @@ public class CustomerOrgParameterDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java
index 797324673c..f750885866 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class CustomerStaffAgencyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java
index 4751f197c1..5458d893e7 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 部门人员关系表 
+ * 部门人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -83,4 +84,4 @@ public class CustomerStaffDepartmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java
index 471afebf64..6d82e25fcc 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 网格人员关系表 
+ * 网格人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -83,4 +84,4 @@ public class CustomerStaffGridDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java
index 3ec964009d..7918911d7a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class IcBuildingUnitDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeDetailDTO.java
index e667dc78bc..dab15f05a3 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeDetailDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeDetailDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -47,7 +48,7 @@ public class IcHouseChangeDetailDTO implements Serializable {
 	private String changeAfter;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -76,4 +77,4 @@ public class IcHouseChangeDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeRecordDTO.java
index bfe7eaaabf..1aec9d50fc 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeRecordDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseChangeRecordDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -72,7 +73,7 @@ public class IcHouseChangeRecordDTO implements Serializable {
 	private String pids;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -101,4 +102,4 @@ public class IcHouseChangeRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcMatterAppointmentRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcMatterAppointmentRecordDTO.java
index 27ee8af29b..8419bfee82 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcMatterAppointmentRecordDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcMatterAppointmentRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,12 +35,12 @@ public class IcMatterAppointmentRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
     /**
-     * 
+     *
      */
 	private String customerId;
 
@@ -54,12 +55,12 @@ public class IcMatterAppointmentRecordDTO implements Serializable {
 	private String orgType;
 
     /**
-     * 
+     *
      */
 	private String pid;
 
     /**
-     * 
+     *
      */
 	private String pids;
 
@@ -94,7 +95,7 @@ public class IcMatterAppointmentRecordDTO implements Serializable {
 	private String status;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -128,4 +129,4 @@ public class IcMatterAppointmentRecordDTO implements Serializable {
      */
 	private String timeId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
index 004c2312b4..14bc28d43b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class IcNeighborHoodDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java
index 6d5ca4a3bc..20a0d8962e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class IcNeighborHoodPartDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java
index e889a21468..1ba81dc9c9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class IcNeighborHoodPropertyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterDTO.java
index 50430c31b5..212c2c46f6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class IcPartyServiceCenterDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,12 +55,12 @@ public class IcPartyServiceCenterDTO implements Serializable {
 	private String orgType;
 
     /**
-     * 
+     *
      */
 	private String pid;
 
     /**
-     * 
+     *
      */
 	private String pids;
 
@@ -109,7 +110,7 @@ public class IcPartyServiceCenterDTO implements Serializable {
 	private String address;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -138,4 +139,4 @@ public class IcPartyServiceCenterDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterMatterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterMatterDTO.java
index c946c13431..dcb9febc59 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterMatterDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterMatterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class IcPartyServiceCenterMatterDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -64,7 +65,7 @@ public class IcPartyServiceCenterMatterDTO implements Serializable {
 	private String endTime;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -103,4 +104,4 @@ public class IcPartyServiceCenterMatterDTO implements Serializable {
      */
 	private String matterImg;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java
index f836ce406f..91628ea279 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class IcPlaceOrgDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java
index 519ec4f1a4..a4cfc2263a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -143,4 +144,4 @@ public class IcPlacePatrolRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java
index d93e3928c7..29d477df0d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcPlacePatrolReviewRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java
index 7e4531f0a4..ce96953641 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class IcPlacePatrolTeamDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java
index 36eb03ac3a..742e0bef81 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IcPlacePatrolTeamStaffDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java
index 732ff0d5ce..3554df553f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -73,4 +74,4 @@ public class IcPropertyManagementDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java
index 9e29a92560..47e3105b3d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffOrgRelationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class StaffOrgRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
index ce08a1e8f0..88ee441b08 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -101,4 +102,4 @@ public class StaffTransferRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java
index af79efc772..6287eacc19 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java
@@ -20,11 +20,10 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
- * 网格人员关系表 
+ * 网格人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -45,4 +44,4 @@ public class UserIdAndPidDTO implements Serializable {
      */
     private String pid;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyAndStaffFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyAndStaffFormDTO.java
index 65882c543f..a152dcd542 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyAndStaffFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyAndStaffFormDTO.java
@@ -19,9 +19,7 @@ package com.epmet.dto.form;
 
 import com.epmet.dto.CustomerAgencyDTO;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 
@@ -45,4 +43,4 @@ public class AddAgencyAndStaffFormDTO implements Serializable {
     private AdminStaffFromDTO staffDTO;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java
index 575a498d57..ec7668c075 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java
@@ -21,7 +21,6 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
@@ -103,4 +102,4 @@ public class AddAgencyFormDTO implements Serializable {
      * 中心点位位置
      */
     private String centerAddress;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AdminStaffFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AdminStaffFromDTO.java
index 926e17b75e..69e091b7a9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AdminStaffFromDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AdminStaffFromDTO.java
@@ -4,8 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java
index 86bd71498a..487b64a76f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java
@@ -18,9 +18,7 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -48,4 +46,4 @@ public class AgencyDeptGridFormDTO implements Serializable {
      */
     private List<String> gridIdList;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java
index 0606ef9c7e..f3b22c5b6e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CreateQrCodeFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CreateQrCodeFormDTO.java
index b209fccbf0..7b934f7e6f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CreateQrCodeFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CreateQrCodeFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.Group;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
index 0ceff8ebab..e55df29063 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java
@@ -19,12 +19,10 @@ package com.epmet.dto.form;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -76,4 +74,4 @@ public class EditPlacePatrolReviewRecordFormDTO implements Serializable {
     public interface Del { }
     public interface Detail { }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingUnitFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingUnitFormDTO.java
index 74a38b8e2b..c5f3e0e7a7 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingUnitFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingUnitFormDTO.java
@@ -17,14 +17,9 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
@@ -39,4 +34,4 @@ public class IcBulidingUnitFormDTO implements Serializable {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java
index 503164633d..133f0df8a4 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffInfoFromDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateTagUseCountsFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateTagUseCountsFormDTO.java
index be0e75573e..2695a5af05 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateTagUseCountsFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateTagUseCountsFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ActSponsorGridInfo.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ActSponsorGridInfo.java
index d0d0fa1d86..757fbbcf4d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ActSponsorGridInfo.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ActSponsorGridInfo.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java
index ffb4d74c20..75cff3e6c8 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentExistRecordResultDTO.java
@@ -1,12 +1,8 @@
 package com.epmet.dto.result;
 
-import com.epmet.commons.tools.constant.NumConstant;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @Author zxc
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java
index dd84877e56..46fe3ff154 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java
@@ -20,8 +20,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -39,4 +37,4 @@ public class ArticleAgencyGridListResultDTO implements Serializable {
      */
     private ArticleGridResultDTO agencyGridList;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
index 4835cefba5..212c85a700 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListInfoResultDTO.java
index 110ecf7cf4..fd2a4dd1f5 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListInfoResultDTO.java
@@ -2,8 +2,6 @@ package com.epmet.dto.result;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java
new file mode 100644
index 0000000000..3d2e8a0360
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java
@@ -0,0 +1,191 @@
+package com.epmet.dto.result;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:房屋和房屋成员返回结果类
+ *
+ * @author: LiuJanJun
+ * @date: 2022/5/9 1:58 下午
+ * @version: 1.0
+ */
+@Data
+public class HouseMemberResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ColumnWidth(value = 7)
+    @ExcelProperty(value = "序号",index = 0)
+    private Integer num;
+
+    @ExcelProperty(value = {"房屋信息","所属组织"},index = 1)
+    private String agencyName;
+    @ExcelProperty(value = {"房屋信息","所属网格"},index = 2)
+    private String gridName;
+    @ExcelIgnore
+    private String neighborHoodId;
+    @ExcelProperty(value = {"房屋信息","所属小区"},index = 3)
+    private String neighborHoodName;
+    @ExcelIgnore
+    private String buildingId;
+    @ExcelIgnore
+    private String houseId;
+    @ExcelProperty(value = {"房屋信息","所属楼栋"},index = 4)
+    private String buildingName;
+    @ExcelProperty(value = {"房屋信息","单元"},index = 5)
+    private String unitNum;
+    /**
+     * 门牌号
+     */
+    @ExcelProperty(value = {"房屋信息","门牌号"},index = 6)
+    private String doorName;
+    /**
+     * 房屋类型，1楼房，2平房，3别墅
+     */
+    @ExcelProperty(value = {"房屋信息","房屋类型"},index = 7)
+    private String houseType;
+
+    /**
+     * 房屋用途
+     */
+    @ExcelProperty(value = {"房屋信息","房屋用途"},index = 8)
+    private String purpose;
+    /**
+     * 房屋状态
+     */
+    @ExcelProperty(value = {"房屋信息","房屋状态"},index = 9)
+    private String rentFlag;
+
+    /**
+     * 房主姓名
+     */
+    @ExcelProperty(value = {"房屋信息","房主姓名"},index = 10)
+    private String ownerName;
+    /**
+     * 房主电话
+     */
+    @ExcelProperty(value = {"房屋信息","房主电话"},index = 11)
+    private String ownerPhone;
+    /**
+     * 房主身份证
+     */
+    @ExcelProperty(value = {"房屋信息","房主身份证"},index = 12)
+    private String ownerIdCard;
+
+
+    //居民信息/**/
+    /**
+     * 主键
+     */
+    @ExcelIgnore
+    private String id;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = {"实际居住人信息","姓名"},index = 13)
+    private String name;
+
+    /**
+     * 性别
+     */
+    @ExcelProperty(value = {"实际居住人信息","性别"},index = 14)
+    private String gender;
+
+    /**
+     * 手机号
+     */
+    @ExcelProperty(value = {"实际居住人信息","手机号"},index = 15)
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = {"实际居住人信息","身份证号"},index = 16)
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    @ExcelProperty(value = {"实际居住人信息","出生日期"},index = 17)
+    private String birthday;
+
+    /**
+     * 户籍所在地
+     */
+    @ExcelProperty(value = {"实际居住人信息","户籍所在地"},index = 18)
+    private String hjszd;
+
+    /**
+     * 与户主关系【字典表】
+     */
+    @ExcelProperty(value = {"实际居住人信息","与户主关系"},index = 19)
+    private String yhzgx;
+
+    /**
+     * 是否党员
+     */
+    @ExcelProperty(value = {"实际居住人信息","是否党员"},index = 20)
+    private String isParty;
+
+    /**
+     * 是否租户
+     */
+    @ExcelProperty(value = {"实际居住人信息","是否租户"},index = 21)
+    private String isTenant;
+
+    /**
+     * 是否流动人口
+     */
+    @ExcelProperty(value = {"实际居住人信息","是否流动人口"},index = 22)
+    private String isFloating;
+
+    /**
+     * 工作单位
+     */
+    @ExcelProperty(value = {"实际居住人信息","工作单位"},index = 23)
+    private String gzdw;
+
+    /**
+     * 民族【字典表】
+     */
+    @ExcelProperty(value = {"实际居住人信息","民族"},index = 24)
+    private String mz;
+
+    /**
+     * 籍贯
+     */
+    @ExcelProperty(value = {"实际居住人信息","籍贯"},index = 25)
+    private String jg;
+
+    /**
+     * 婚姻状况【字典表】
+     */
+    @ExcelProperty(value = {"实际居住人信息","婚姻状况"},index = 26)
+    private String hyzk;
+
+    /**
+     * 文化程度【字典表】
+     */
+    @ExcelProperty(value = {"实际居住人信息","文化程度"},index = 27)
+    private String culture;
+
+    /**
+     * 宗教信仰
+     */
+    @ExcelProperty(value = {"实际居住人信息","宗教信仰"},index = 28)
+    private String faith;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = {"实际居住人信息","备注"},index = 29)
+    private String remarks;
+
+
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 93b9b9818e..4c1b40288f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -49,7 +49,7 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String buildingName;
     /**
-     * 单元号
+     * 单元号_单元
      */
     private String unitNum;
     /**
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java
new file mode 100644
index 0000000000..6879feb43d
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户基础信息
+ * @Author yinzuomei
+ * @Date 2021/11/1 10:34 上午
+ */
+@Data
+public class IcHouseMemberResultDTO implements Serializable {
+    private static final long serialVersionUID = 5621052927788129250L;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+
+}
+
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPropertyManagementResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPropertyManagementResultDTO.java
index 6f2e058206..3fe10320ba 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPropertyManagementResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPropertyManagementResultDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 网格列表信息
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
index 86b1a95c14..ae9df9beec 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * @Author zxc
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java
index 866f1cc981..5ed421dee6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Author sun
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubAgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubAgencyResultDTO.java
index ea9810c94c..88f9ab432e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubAgencyResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubAgencyResultDTO.java
@@ -19,7 +19,6 @@ package com.epmet.dto.result;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -45,4 +44,4 @@ public class SubAgencyResultDTO implements Serializable {
     private List<SubListResultDTO> agencyList;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitDTO.java
index 77b51dfca0..eafd494a7f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UpdateBuildingHouseNumResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UpdateBuildingHouseNumResultDTO.java
index 0a3d25f464..ee74765904 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UpdateBuildingHouseNumResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UpdateBuildingHouseNumResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java
index 00107ec8f5..7b310c47a9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java
@@ -2,8 +2,6 @@ package com.epmet.enums;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Optional;
-
 /**
  * @Description 入职级别枚举
  * @author wxz
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 87db3dd3e6..e2c0ae2359 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -614,4 +614,14 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/ichouse/houses-name")
     Result<List<HousesNameResultDTO>> getHousesNameByIdCards(@RequestBody List<String> idCards);
+
+    /**
+     * Desc: 房屋更新
+     * @param tokenDTO
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/11 09:46
+     */
+    @PostMapping("/gov/org/house/houseupdate")
+    Result houseUpdate(@RequestBody IcHouseAddFormDTO formDTO);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 4e48ff1657..595fd11928 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -398,4 +398,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<List<HousesNameResultDTO>> getHousesNameByIdCards(List<String> idCards) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHousesNameByIdCards", idCards);
     }
+
+    @Override
+    public Result houseUpdate( IcHouseAddFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate",formDTO);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/LoadBalanceConfig.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/LoadBalanceConfig.java
index 97bd3ae321..6fa50e0295 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/LoadBalanceConfig.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/LoadBalanceConfig.java
@@ -1,10 +1,6 @@
 package com.epmet.config;
 
-import com.epmet.loadbalancer.EpmetRequestLoadBalancerRule;
-import com.netflix.loadbalancer.IRule;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 
 @Configuration
 public class LoadBalanceConfig {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index 6f227ba196..659b411519 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -43,7 +43,6 @@ import com.epmet.service.AgencyService;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.IcNeighborHoodService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
index 5f8dc2e298..e12703d196 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerDepartmentDTO;
 import com.epmet.excel.CustomerDepartmentExcel;
 import com.epmet.service.CustomerDepartmentService;
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 客户部门表  
+ * 客户部门表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerdepartment")
 public class CustomerDepartmentController {
-    
+
     @Autowired
     private CustomerDepartmentService customerDepartmentService;
 
@@ -91,4 +91,4 @@ public class CustomerDepartmentController {
         ExcelUtils.exportExcelToTarget(response, null, list, CustomerDepartmentExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
index e61828a3c4..784b1a4ef1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
 import com.epmet.dto.form.DepartmentIdFormDTO;
 import com.epmet.excel.CustomerStaffDepartmentExcel;
@@ -38,7 +38,7 @@ import java.util.Map;
 
 
 /**
- * 部门人员关系表 
+ * 部门人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -46,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerstaffdepartment")
 public class CustomerStaffDepartmentController {
-    
+
     @Autowired
     private CustomerStaffDepartmentService customerStaffDepartmentService;
 
@@ -104,4 +104,4 @@ public class CustomerStaffDepartmentController {
         return new Result<List<String>>().ok(customerStaffDepartmentService.getDepartmentStaffs(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
index 186cae52b6..79b1975b9a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
@@ -9,7 +9,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.CustomerStaffAgencyService;
-import com.epmet.service.CustomerStaffAgencyService;
 import com.epmet.service.DepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -162,4 +161,4 @@ public class DepartmentController {
         List<DepartmentListResultDTO> deptList = departmentService.listDepartmentListByStaffId(staffId);
         return new Result<List<DepartmentListResultDTO>>().ok(deptList);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index 1d9903832b..c8cedf436e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -18,6 +18,13 @@
 package com.epmet.controller;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
@@ -28,7 +35,10 @@ import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.form.*;
@@ -37,18 +47,25 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.HouseService;
 import com.epmet.util.ExcelPoiUtils;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -305,4 +322,79 @@ public class HouseController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * desc: 导出一户一档
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @param response
+     * @return void
+     * @author LiuJanJun
+     * @date 2022/5/9 1:42 下午
+     */
+    @NoRepeatSubmit
+    @RequestMapping(value = "/exportHouseUser")
+    public void exportHouseUser(@LoginUser TokenDto tokenDto, @RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
+        formDTO.setIsPage(false);
+        formDTO.setPageSize(NumConstant.ONE_THOUSAND);
+        //效验数据
+        if (StringUtils.isBlank(formDTO.getAgencyId())){
+            LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败");
+            formDTO.setAgencyId(loginUserDetail.getAgencyId());
+        }
+        ValidatorUtils.validateEntity(formDTO);
+
+        ExcelWriter excelWriter = null;
+        try {
+            // 头的策略
+            WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+            // 背景设置为红色
+            headWriteCellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
+            WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+            contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response))
+                    .registerWriteHandler(horizontalCellStyleStrategy)
+                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                    .build();
+            int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12};
+
+            //冻结表头 2行
+            FreezeAndFilter writeHandler = new FreezeAndFilter();
+            writeHandler.rowSplit = 2;
+            ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false);
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1")
+                    .head(HouseMemberResultDTO.class)
+                    .registerWriteHandler(mergeStrategy)
+                    .registerWriteHandler(writeHandler)
+                    .build();
+            PageData<HouseMemberResultDTO> dataList = null;
+            Cache<String,Boolean> haveSearchCache = CacheBuilder.newBuilder().maximumSize(NumConstant.ONE_HUNDRED).expireAfterWrite(NumConstant.THIRTY, TimeUnit.MINUTES).build();
+            do {
+                dataList = houseService.getHouseUser(tokenDto,formDTO,haveSearchCache);
+
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+                excelWriter.write(dataList.getList(), writeSheet);
+                if (CollectionUtils.isEmpty(dataList.getList())){
+                    break;
+                }
+            }while (dataList.getTotal() == formDTO.getPageSize());
+            //获取导出配置
+            haveSearchCache.invalidateAll();
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } finally {
+            if (excelWriter != null){
+                excelWriter.finish();
+            }
+        }
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeDetailController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeDetailController.java
index d6193984c1..a676485720 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeDetailController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeDetailController.java
@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcHouseChangeDetailDTO;
 import com.epmet.service.IcHouseChangeDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java
index 78a25c51e4..44eb92510e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java
@@ -1,7 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
@@ -10,8 +9,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcHouseChangeRecordDTO;
 import com.epmet.dto.form.HouseChangeListFormDTO;
 import com.epmet.service.IcHouseChangeRecordService;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMatterAppointmentRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMatterAppointmentRecordController.java
index 848ab27ceb..b331c2cbb8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMatterAppointmentRecordController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMatterAppointmentRecordController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcMatterAppointmentRecordDTO;
 import com.epmet.excel.IcMatterAppointmentRecordExcel;
 import com.epmet.service.IcMatterAppointmentRecordService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icmatterappointmentrecord")
 public class IcMatterAppointmentRecordController {
-    
+
     @Autowired
     private IcMatterAppointmentRecordService icMatterAppointmentRecordService;
 
@@ -91,4 +91,4 @@ public class IcMatterAppointmentRecordController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcMatterAppointmentRecordExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
index 5100759cc6..627b5a5d8b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -45,7 +45,6 @@ import com.epmet.service.IcNeighborHoodService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
index df9fa9100d..545726ea84 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
@@ -26,8 +26,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcPartyServiceCenterDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AllMattersResultDTO;
@@ -40,7 +40,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -52,7 +53,7 @@ import java.util.*;
 @RestController
 @RequestMapping("icpartyservicecenter")
 public class IcPartyServiceCenterController {
-    
+
     @Autowired
     private IcPartyServiceCenterService icPartyServiceCenterService;
 
@@ -248,4 +249,4 @@ public class IcPartyServiceCenterController {
         return new Result<PartyServiceCenterListResultDTO>().ok(icPartyServiceCenterService.partyServiceCenterDetail(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterMatterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterMatterController.java
index affe64381a..8e7c6f2c93 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterMatterController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterMatterController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcPartyServiceCenterMatterDTO;
 import com.epmet.excel.IcPartyServiceCenterMatterExcel;
 import com.epmet.service.IcPartyServiceCenterMatterService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icpartyservicecentermatter")
 public class IcPartyServiceCenterMatterController {
-    
+
     @Autowired
     private IcPartyServiceCenterMatterService icPartyServiceCenterMatterService;
 
@@ -91,4 +91,4 @@ public class IcPartyServiceCenterMatterController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcPartyServiceCenterMatterExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java
index 9d3750d7b8..b5ce7ba7d9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
 import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
-import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO;
 import com.epmet.service.IcPlacePatrolTeamStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,7 +41,7 @@ import java.util.List;
 @RestController
 @RequestMapping("placepatrolteamstaff")
 public class IcPlacePatrolTeamStaffController {
-    
+
     @Autowired
     private IcPlacePatrolTeamStaffService placePatrolTeamStaffService;
 
@@ -56,4 +55,4 @@ public class IcPlacePatrolTeamStaffController {
         return new Result<List<IcPlacePatrolTeamStaffDTO>>().ok(placePatrolTeamStaffService.getList(formDTO.getTeamId()));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java
index baa7c40fc4..4b534e576e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java
@@ -18,20 +18,17 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcPropertyManagementDTO;
 import com.epmet.service.IcPropertyManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 
@@ -44,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icpropertymanagement")
 public class IcPropertyManagementController {
-    
+
     @Autowired
     private IcPropertyManagementService icPropertyManagementService;
 
@@ -84,4 +81,4 @@ public class IcPropertyManagementController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
index 4cd9ea0e05..64f41b0014 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.StaffTransferRecordDTO;
 import com.epmet.excel.StaffTransferRecordExcel;
 import com.epmet.service.StaffTransferRecordService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("stafftransferrecord")
 public class StaffTransferRecordController {
-    
+
     @Autowired
     private StaffTransferRecordService staffTransferRecordService;
 
@@ -91,4 +91,4 @@ public class StaffTransferRecordController {
         ExcelUtils.exportExcelToTarget(response, null, list, StaffTransferRecordExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
index 363e575499..9fe3ea8e90 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
-import com.epmet.dto.result.ParentListResultDTO;
 import com.epmet.entity.CustomerStaffDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -27,7 +26,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * 部门人员关系表 
+ * 部门人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
@@ -74,4 +73,4 @@ public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartm
      * @date 2020/8/13 2:53 下午
      */
     List<String> getDepartmentStaffList(@Param("departmentId")String departmentId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index 8d1a4865de..d835e2e65d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -18,9 +18,9 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.NeighborHoodAndManagementDTO;
-import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.entity.IcHouseEntity;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java
index 75f75e87fc..0047c1ea09 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java
@@ -26,7 +26,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 党群服务中心
@@ -88,4 +87,4 @@ public interface IcPartyServiceCenterDao extends BaseDao<IcPartyServiceCenterEnt
      */
     void delMatters(@Param("centerIds")List<String> centerIds);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
index 442f3d0514..24bd9b22e2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
@@ -23,7 +23,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 物业表
@@ -51,4 +50,4 @@ public interface IcPropertyManagementDao extends BaseDao<IcPropertyManagementEnt
      * @date 2022/2/13 9:59 上午
      */
     List<IcPropertyManagementEntity> selectIdByName(@Param("names")List<String> names);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrgParameterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrgParameterEntity.java
index 489118f7c8..9d04bf4520 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrgParameterEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrgParameterEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户组织相关参数表
  *
@@ -54,7 +51,7 @@ public class CustomerOrgParameterEntity extends BaseEpmetEntity {
 	private String parameterName;
 
     /**
-     * 参数值 eg:开启：open；关闭：closed 
+     * 参数值 eg:开启：open；关闭：closed
      */
 	private String parameterValue;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
index 98610e75f7..7c1d45ade5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党支部信息
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java
index f9b1d01de8..dbe4864d37 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 人员-机关单位关系表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java
index 486bd1d140..f491061e08 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 部门人员关系表 
+ * 部门人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java
index 920e672a20..8aa44bcb21 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 网格人员关系表 
+ * 网格人员关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java
index d7212ff143..bce611c47f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 楼栋单元信息
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeDetailEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeDetailEntity.java
index 7c116935cb..71e35d81d3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeDetailEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeDetailEntity.java
@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 房屋变更详情表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeRecordEntity.java
index 920804fec2..e6a187c18e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeRecordEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseChangeRecordEntity.java
@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 房屋变更记录表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
index 817c783f47..362740e9c2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
@@ -18,13 +18,11 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 房屋信息
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcMatterAppointmentRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcMatterAppointmentRecordEntity.java
index c7df20f0f7..aa5756bdb0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcMatterAppointmentRecordEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcMatterAppointmentRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 事项预约记录
  *
@@ -39,7 +36,7 @@ public class IcMatterAppointmentRecordEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String customerId;
 
@@ -54,12 +51,12 @@ public class IcMatterAppointmentRecordEntity extends BaseEpmetEntity {
 	private String orgType;
 
     /**
-     * 
+     *
      */
 	private String pid;
 
     /**
-     * 
+     *
      */
 	private String pids;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
index 9fb05feb87..8f83a0aba1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
@@ -19,13 +19,10 @@ package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小区表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java
index 5f9929c5f4..a29abef714 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小区-分区表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java
index 19827d15bf..f9143b055b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小区物业关系表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterEntity.java
index b2b422ff9e..9b40b223b3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党群服务中心
  *
@@ -54,12 +51,12 @@ public class IcPartyServiceCenterEntity extends BaseEpmetEntity {
 	private String orgType;
 
     /**
-     * 
+     *
      */
 	private String pid;
 
     /**
-     * 
+     *
      */
 	private String pids;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterMatterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterMatterEntity.java
index 75ab20add9..9248d827f2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterMatterEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterMatterEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党群服务中心可预约事项表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java
index 65540a28b1..2d2038360e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 九小场所下组织管理
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java
index 3b6995b09c..abb8346af2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java
index dd492d7dfa..b4c317fd94 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java
index 85b37ddd64..74c68fa96e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java
index fc16a6dc42..893ca66e0a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 场所分队下人员管理
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
index 68dd3a349e..ff8b648d6a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 物业表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java
index f9c31b49d9..99c242b25d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffOrgRelationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员注册组织关系表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
index 2b31698659..7f54df2973 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员调动记录表
  *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
index b996da1bf2..e9306fa5d7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
@@ -18,8 +18,6 @@
 package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.util.ExcelVerifyInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
@@ -27,7 +25,6 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 小区表
@@ -134,4 +131,4 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable
     @JsonIgnore
     private Boolean reStatus = false;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java
index f2746aa90b..996a542653 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java
@@ -1,7 +1,6 @@
 package com.epmet.model;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
index c49ea51719..70d1977338 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
@@ -1,9 +1,7 @@
 package com.epmet.model;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author zxc
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
index c9b9140f9d..94de07dbbc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
@@ -25,7 +25,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index 2203ca98a2..b070543014 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
@@ -8,7 +8,6 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.CustomerGridConstant;
-import com.epmet.constant.ImportErrorMsgConstants;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.IcHouseDTO;
@@ -33,13 +32,10 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.epmet.constant.ImportErrorMsgConstants.*;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java
index fb25ab3ddb..fa0ef77674 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java
@@ -1,7 +1,6 @@
 package com.epmet.model;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
index ea2474714b..86f257d9aa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -4,7 +4,6 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
-import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.mq.listener.InitCustomerOrgRolesListener;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 import org.springframework.stereotype.Component;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
index 99076f48e9..c6b606e7df 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
@@ -22,9 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
@@ -144,4 +142,4 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      */
     List<String> getAllStaffByGridId(String gridId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java
index 375af23acf..c97f61e6a1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java
@@ -20,7 +20,10 @@ package com.epmet.service;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.AddDepartmentResultDTO;
+import com.epmet.dto.result.DepartmentDetailResultDTO;
+import com.epmet.dto.result.DepartmentInAgencyResultDTO;
+import com.epmet.dto.result.DepartmentListResultDTO;
 
 import java.util.List;
 
@@ -101,4 +104,4 @@ public interface DepartmentService {
      * @return
      */
     List<DepartmentListResultDTO> listDepartmentListByStaffId(String staffId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
index b872a9fc8c..e60bfb50ae 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
@@ -18,10 +18,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.google.common.cache.Cache;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -36,6 +38,7 @@ import java.util.Set;
  */
 public interface HouseService {
 
+
     void addHouse(String customerId, IcHouseAddFormDTO formDTO);
 
 
@@ -105,4 +108,13 @@ public interface HouseService {
      * @date 2022/5/6 08:50
      */
     void updateSort(UpdateSortFormDTO formDTO);
+
+    /**
+     * desc:条件获取房和家庭成员
+     * @param tokenDto
+     * @param formDTO
+     * @param haveSearchCache
+     * @return
+     */
+    PageData<HouseMemberResultDTO> getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache<String, Boolean> haveSearchCache);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java
index a622e03811..070d2cc8c4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java
@@ -19,7 +19,6 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
-import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
 import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 
 import java.util.List;
@@ -49,4 +48,4 @@ public interface IcPlacePatrolTeamStaffService extends BaseService<IcPlacePatrol
      * @Description 逻辑删除分队成员子表数据
      **/
     void upByTeamId(String staffId, String teamId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
index 3f2e484d11..48e8ce4d52 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CustomerStaffDepartmentDao;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
 import com.epmet.dto.form.DepartmentIdFormDTO;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 9949a8753c..29f240f486 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -1,10 +1,10 @@
 package com.epmet.service.impl;
-import java.util.Date;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -17,6 +17,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
@@ -34,7 +35,6 @@ import com.epmet.enums.HouseRentFlagEnums;
 import com.epmet.enums.HouseTypeEnums;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.model.HouseInfoModel;
 import com.epmet.model.ImportHouseInfoListener;
 import com.epmet.redis.IcHouseRedis;
@@ -42,6 +42,8 @@ import com.epmet.service.*;
 import com.epmet.util.ExcelPoiUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,7 @@ import java.io.InputStream;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -62,7 +65,10 @@ import java.util.stream.Collectors;
 @Service
 public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
-
+    /**
+     * 导出房屋内家庭成员时本地缓存
+     */
+    private static final Cache<String,List<HouseIcResiUserResultDTO.HouseMemberResultDTO>> memberCacheMap = CacheBuilder.newBuilder().expireAfterAccess(10, TimeUnit.SECONDS).expireAfterWrite(30,TimeUnit.MINUTES).build();
 
     @Autowired
     private IcHouseService icHouseService;
@@ -75,12 +81,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Resource
     private IcBuildingDao icBuildingDao;
     @Resource
-    private IcBuildingUnitDao icBuildingUnitDao;
-    @Resource
     private IcHouseDao icHouseDao;
     @Autowired
-    private GovOrgOpenFeignClient govOrgOpenFeignClient;
-    @Autowired
     private IcHouseRedis icHouseRedis;
     @Autowired
     private AgencyService agencyservice;
@@ -280,14 +282,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             pids = getPids(formDTO.getAgencyId());
         }
         formDTO.setPids(pids);
-        PageInfo<IcHouseListResultDTO> pageInfo = null;
-        if (formDTO.getIsPage()){
-            pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage())
+        PageInfo<IcHouseListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage())
                     .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO));
-        }else{
-            List<IcHouseListResultDTO> resultDTOS = icHouseDao.searchHouseByPage(formDTO);
-            pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size());
-        }
+
 
         List<IcHouseListResultDTO> records = pageInfo.getList();
         records.forEach(item->{
@@ -295,7 +292,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey()));
         });
 
-        return new PageData<>(records,pageInfo.getTotal());
+
+        return new PageData<>(records == null? new ArrayList<>():records,pageInfo.getTotal());
     }
     public String getPids(String agencyId){
         String pids = null;
@@ -318,10 +316,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
         //如果类型是house 查房屋
         //导出房屋
-        PageData<IcHouseListResultDTO> icHouseExcels = getHouseList(formDTO);
+        List<IcHouseListResultDTO> list = new ArrayList<>();
+        do {
+            PageData<IcHouseListResultDTO> icHouseExcels = getHouseList(formDTO);
+            if (CollectionUtils.isEmpty(icHouseExcels.getList())){
+                break;
+            }
+            list.addAll(icHouseExcels.getList());
+        }while (list.size() == formDTO.getPageSize());
         TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx");
         Map<String,Object> map = new HashMap<>();
-        map.put("maplist",icHouseExcels.getList());
+        map.put("maplist", list);
         ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response);
     }
 
@@ -579,6 +584,110 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
     }
 
+    @Override
+    public PageData<HouseMemberResultDTO> getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache<String, Boolean> haveSearchCache) {
+        RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO();
+        resiParam.setCustomerId(tokenDto.getCustomerId());
+        resiParam.setAgencyId(formDTO.getAgencyId());
+        resiParam.setGridId(formDTO.getGridId());
+        resiParam.setPageSize(NumConstant.ONE_THOUSAND);
+        resiParam.setIsPage(false);
+
+        //查询级别 默认按照小区去查
+        int searchLevel = 0;
+
+        //如果楼宇id不为空 则直接查询楼宇内的居民
+        if (StringUtils.isNotEmpty(formDTO.getBuildingId())){
+            searchLevel = 1;
+        }
+        //如果有具体的查询套件 则直接降级为2 按照房屋Id 来查
+        if (StringUtils.isNotEmpty(formDTO.getOwnerName()) || StringUtils.isNotEmpty(formDTO.getOwnerPhone()) || StringUtils.isNotEmpty(formDTO.getRentFlag())){
+            searchLevel = 2;
+        }
+
+        PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO);
+
+        List<HouseMemberResultDTO> resultList = new ArrayList<>();
+        PageData<HouseMemberResultDTO> result = new PageData<>(resultList,houseData.getList().size());
+        int finalSearchLevel = searchLevel;
+        AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize());
+
+        houseData.getList().forEach(o ->{
+
+            resiParam.setNeighborHoodId(o.getNeighborHoodId());
+            if (finalSearchLevel == 1){
+                resiParam.setBuildingId(o.getBuildingId());
+            }
+            if (finalSearchLevel == 2){
+                resiParam.setHouseId(o.getHouseId());
+            }
+            this.getHouseMembers(resiParam, memberCacheMap,haveSearchCache);
+            List<HouseIcResiUserResultDTO.HouseMemberResultDTO> members = memberCacheMap.getIfPresent(o.getHouseId());
+
+            //序号 一个houseId为一个序号
+            int n = num.incrementAndGet();
+
+            //没有住户 则直接写房屋
+            if (CollectionUtils.isEmpty(members)){
+                HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(o, HouseMemberResultDTO.class);
+                resultDTO.setNum(n);
+                resultList.add(resultDTO);
+                return;
+            }
+            //有住户 房屋信息是重复的
+            members.forEach(m->{
+                HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(m, HouseMemberResultDTO.class);
+                resultDTO.setNum(n);
+                resultDTO.setAgencyName(o.getAgencyName());
+                resultDTO.setGridName(o.getGridName());
+                resultDTO.setNeighborHoodName(o.getNeighborHoodName());
+                resultDTO.setBuildingName(o.getBuildingName());
+                resultDTO.setUnitNum(o.getUnitNum());
+                resultDTO.setDoorName(o.getDoorName());
+                resultDTO.setHouseType(o.getHouseType());
+                resultDTO.setPurpose(o.getPurpose());
+                resultDTO.setRentFlag(o.getRentFlag());
+                resultDTO.setOwnerName(o.getOwnerName());
+                resultDTO.setOwnerPhone(o.getOwnerPhone());
+                resultDTO.setOwnerIdCard(o.getOwnerIdCard());
+                resultList.add(resultDTO);
+            });
+        });
+        return result;
+    }
+
+    /**
+     * desc:分情况获取 房屋内居民
+     * @param resiParam
+     * @param memberMap
+     * @param haveSearchCache
+     */
+    public void getHouseMembers(RentTenantDataFormDTO resiParam, Cache<String, List<HouseIcResiUserResultDTO.HouseMemberResultDTO>> memberMap, Cache<String, Boolean> haveSearchCache) {
+        String searchKey = resiParam.getHouseId()+resiParam.getBuildingId()+resiParam.getNeighborHoodId()+resiParam.getAgencyId();
+        Boolean haveSearch = haveSearchCache.getIfPresent(searchKey);
+        if (haveSearch!= null && haveSearch){
+            return;
+        }
+        haveSearchCache.put(searchKey,true);
+        List<HouseIcResiUserResultDTO> memberListTemp = null;
+        resiParam.setPageNo(NumConstant.ONE);
+        do {
+            Result<List<HouseIcResiUserResultDTO>> memberResult = epmetUserOpenFeignClient.getHouseMemberList(resiParam);
+            log.debug("=======查询居民:"+ resiParam.getPageNo()+",size:"+resiParam.getPageSize()+",result:"+memberResult.getData().size());
+            if (!memberResult.success()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "调用user服务失败");
+            }
+            memberListTemp = memberResult.getData();
+            log.debug("=======查询居民结果:"+ JSON.toJSONString(memberListTemp));
+            if (CollectionUtils.isEmpty(memberListTemp)) {
+                break;
+            }
+            resiParam.setPageNo(resiParam.getPageNo()+1);
+            memberListTemp.parallelStream().forEach(h -> memberMap.put(h.getHomeId(), h.getHouseMemberList()));
+
+        } while (memberListTemp.size() == resiParam.getPageSize());
+    }
+
     /**
      * @Author sun
      * @Description 【人房】房屋、居民统计列表数据
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeDetailServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeDetailServiceImpl.java
index 0e43ff2a95..c70fd22a5a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeDetailServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeDetailServiceImpl.java
@@ -3,15 +3,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcHouseChangeDetailDao;
 import com.epmet.dto.IcHouseChangeDetailDTO;
 import com.epmet.entity.IcHouseChangeDetailEntity;
 import com.epmet.service.IcHouseChangeDetailService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -80,4 +79,4 @@ public class IcHouseChangeDetailServiceImpl extends BaseServiceImpl<IcHouseChang
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java
index f1ccb252aa..9a1c6b5137 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -10,7 +11,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcHouseChangeRecordDao;
 import com.epmet.dto.IcHouseChangeRecordDTO;
 import com.epmet.dto.form.HouseChangeListFormDTO;
@@ -20,7 +20,6 @@ import com.epmet.service.IcHouseChangeRecordService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -105,16 +104,10 @@ public class IcHouseChangeRecordServiceImpl extends BaseServiceImpl<IcHouseChang
             throw new EpmetException("未查询到此工作人员"+tokenDto.getUserId());
         }
         formDTO.setAgencyId(staffInfo.getAgencyId());
-        if (formDTO.getIsPage()){
-            PageInfo<HouseChangeListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO));
-            pageData.setList(pageInfo.getList());
-            pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
-        }else {
-            List<HouseChangeListResultDTO> houseChangeList = baseDao.getHouseChangeList(formDTO);
-            pageData.setList(houseChangeList);
-            pageData.setTotal(houseChangeList.size());
-        }
+        PageInfo<HouseChangeListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO));
+        pageData.setList(pageInfo.getList());
+        pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
         return pageData;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 20bea1a301..e884a6904c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -8,6 +8,8 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -89,6 +91,9 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     public IcHouseDTO get(String id) {
         IcHouseEntity entity = baseDao.selectById(id);
         IcHouseDTO dto = ConvertUtils.sourceToTarget(entity, IcHouseDTO.class);
+        if (null == dto) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("houseId:%s已删除", id), "房屋已删除");
+        }
         dto.setHouseTypeName(HouseTypeEnums.getTypeValue(dto.getHouseType()));
         dto.setRentName(HouseRentFlagEnums.getTypeValue(dto.getRentFlag()));
         dto.setPurposeName(HousePurposeEnums.getTypeValue(dto.getPurpose()));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMatterAppointmentRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMatterAppointmentRecordServiceImpl.java
index 6878b736c3..4a0fa92f32 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMatterAppointmentRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMatterAppointmentRecordServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcMatterAppointmentRecordDao;
 import com.epmet.dto.IcMatterAppointmentRecordDTO;
 import com.epmet.entity.IcMatterAppointmentRecordEntity;
 import com.epmet.service.IcMatterAppointmentRecordService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -97,4 +96,4 @@ public class IcMatterAppointmentRecordServiceImpl extends BaseServiceImpl<IcMatt
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java
index b9b3fc4a24..3df04ec698 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcNeighborHoodPartDao;
 import com.epmet.dto.IcNeighborHoodPartDTO;
 import com.epmet.entity.IcNeighborHoodPartEntity;
 import com.epmet.service.IcNeighborHoodPartService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -98,4 +97,4 @@ public class IcNeighborHoodPartServiceImpl extends BaseServiceImpl<IcNeighborHoo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java
index d4f877114a..a0ab16fdb6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcNeighborHoodPropertyDao;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
 import com.epmet.entity.IcNeighborHoodPropertyEntity;
 import com.epmet.service.IcNeighborHoodPropertyService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -98,4 +97,4 @@ public class IcNeighborHoodPropertyServiceImpl extends BaseServiceImpl<IcNeighbo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterMatterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterMatterServiceImpl.java
index e6e85dc9ff..31d476e434 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterMatterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterMatterServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcPartyServiceCenterMatterDao;
 import com.epmet.dto.IcPartyServiceCenterMatterDTO;
 import com.epmet.entity.IcPartyServiceCenterMatterEntity;
 import com.epmet.service.IcPartyServiceCenterMatterService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -120,4 +119,4 @@ public class IcPartyServiceCenterMatterServiceImpl extends BaseServiceImpl<IcPar
         return baseDao.selectMatterNameByCenterId(centerId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
index 44ef7f60b1..14dac11c00 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -34,7 +35,6 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyServiceCenterConstant;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java
index 8f26db929e..df37df58fd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java
@@ -20,8 +20,6 @@ package com.epmet.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.IcPlacePatrolTeamStaffDao;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
-import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
-import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO;
 import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 import com.epmet.service.IcPlacePatrolTeamStaffService;
 import org.springframework.stereotype.Service;
@@ -66,4 +64,4 @@ public class IcPlacePatrolTeamStaffServiceImpl extends BaseServiceImpl<IcPlacePa
         baseDao.upByTeamId(staffId, teamId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
index 991469c313..627af897fb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
@@ -9,7 +9,8 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.NeighborhoodConstant;
-import com.epmet.dao.*;
+import com.epmet.dao.IcNeighborHoodDao;
+import com.epmet.dao.IcNeighborHoodPropertyDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 4976a20114..7e0d3bde18 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -170,7 +170,9 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+        ORDER BY a.sort,
+        CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
+        CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk)
     </select>
 
     <select id="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 8e48d2e4d5..53d4ff2277 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -131,12 +131,21 @@
             <if test='level == "grid"'>
                 AND c.GRID_ID = #{id}
             </if>
+            <if test="gridId != null and gridId != ''">
+                AND c.GRID_ID = #{gridId}
+            </if>
             <if test='level == "neighborHood"'>
                 AND c.id = #{id}
             </if>
+            <if test="neighborHoodId != null and neighborHoodId != ''">
+                AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId}
+            </if>
             <if test='level == "building"'>
                 AND b.id = #{id}
             </if>
+            <if test="buildingId != null and buildingId != ''">
+                AND a.BUILDING_ID = #{buildingId}
+            </if>
             <if test="rentFlag != null and rentFlag.trim() != ''">
                 AND a.RENT_FLAG = #{rentFlag}
             </if>
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java
index 7e139fb402..86136d1ce5 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class CustomerProjectParameterDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
index cbce91656e..a139c9728c 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ProjectCategoryDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
index 1c6ba7c69c..df5b17357b 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class ProjectOrgRelationDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -96,23 +97,23 @@ public class ProjectOrgRelationDTO implements Serializable {
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessAttachmentDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessAttachmentDTO.java
index a64fbbe568..ef5f0f2173 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessAttachmentDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -149,4 +150,4 @@ public class ProjectProcessAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
index aa8bfd0387..813eecb7f4 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
@@ -17,11 +17,11 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 
 /**
  * 项目处理进展表
@@ -139,4 +139,4 @@ public class ProjectProcessDTO implements Serializable {
 	 */
 	private Integer isSend;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessScanTaskDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessScanTaskDTO.java
index 2a62f79281..419c943121 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessScanTaskDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessScanTaskDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -101,4 +102,4 @@ block: 结果违规；】
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java
index 55bbe13d02..d4126e7d18 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java
index c74b05c16f..3e0e214bfb 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ProjectSatisfactionDetailDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java
index 20507c91d4..92556f972a 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ProjectSatisfactionStatisticsDTO implements Serializable {
      */
     private Integer shouldEvaluateCount;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
index 7e4e7d2dce..785eed8ac2 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class ProjectStaffDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java
index e966d0f026..191c75ec8b 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubAttachmentDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 外部系统事件附件 
+ * 外部系统事件附件
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-17
@@ -123,4 +124,4 @@ public class ProjectSubAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
index 866594f1ab..98324356c3 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSubProcessDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 节点事件关联表 
+ * 节点事件关联表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-17
@@ -133,4 +134,4 @@ public class ProjectSubProcessDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java
index 1cc47c4bb6..80237eb975 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ProjectTagsDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
index 48ac7e6404..9fdc0db922 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 分类删除-接口入参
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
index e4632b7f33..25dc6752df 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java
index 5e3f4bf813..c39e98fdca 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PatrolProjectFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author zxc
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
index ed9bb74e21..17f17e8460 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
index d816340cc6..a596ea0160 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ThirdPlatformConfigFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Data
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
index bac2f60c7e..e8735d08ff 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
@@ -1,12 +1,9 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 项目跟踪-转其他部门-勾选的人员信息-接口入参
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
index c397dc8d08..f8491928be 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
index ceae957676..b9f560f0b6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 党建园地-结案项目-接口返参
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java
index b5e41d64a5..4097d3a07b 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java
index 841b1ea207..ef341e951c 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PlatformFileDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
index d77367e075..5961bcf34c 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
@@ -20,8 +20,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -68,4 +66,4 @@ public class ProcesslistResultDTO implements Serializable {
      * 内部备注
      */
     private String internalRemark = "";
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
index 33883cd6ab..182cdff0fd 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
@@ -1,7 +1,5 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.form.ProjectEvaluateFormDTO;
-import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
index 5ff9b4428c..b78c93966b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.constant.ParameterKeyConstant;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.form.ParameterFormDTO;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("parameter")
 public class CustomerProjectParameterController {
-    
+
     @Autowired
     private CustomerProjectParameterService customerProjectParameterService;
 
@@ -181,4 +181,4 @@ public class CustomerProjectParameterController {
         ThirdPlatformConfigResultDTO resultDTO = customerProjectParameterService.loadThirdplatformConfig(input.getCustomerId(), ParameterKeyConstant.THIRD_PLATFORM_PROJECT_SEND);
         return new Result<ThirdPlatformConfigResultDTO>().ok(resultDTO);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java
index 474fb56a9e..c5d5c240ce 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java
@@ -32,7 +32,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
index 7e0dd63b18..b8c77430f6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
@@ -6,8 +6,8 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -30,14 +30,11 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 
 /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessAttachmentController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessAttachmentController.java
index e2552ca57c..bea5524877 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessAttachmentController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessAttachmentController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectProcessAttachmentDTO;
 import com.epmet.excel.ProjectProcessAttachmentExcel;
 import com.epmet.service.ProjectProcessAttachmentService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectprocessattachment")
 public class ProjectProcessAttachmentController {
-    
+
     @Autowired
     private ProjectProcessAttachmentService projectProcessAttachmentService;
 
@@ -91,4 +91,4 @@ public class ProjectProcessAttachmentController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectProcessAttachmentExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
index 773eb8d7f5..bd2f2d6015 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
 import com.epmet.dto.form.ProjectIdFormDTO;
@@ -49,7 +49,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectprocess")
 public class ProjectProcessController {
-    
+
     @Autowired
     private ProjectProcessService projectProcessService;
 
@@ -117,4 +117,4 @@ public class ProjectProcessController {
         return new Result<ProjectDetailCheckResultDTO>().ok(projectProcessService.checkProjectClose(projectIdFormDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessScanTaskController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessScanTaskController.java
index 2080c6c9bc..fa3f0439ec 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessScanTaskController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessScanTaskController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectProcessScanTaskDTO;
 import com.epmet.excel.ProjectProcessScanTaskExcel;
 import com.epmet.service.ProjectProcessScanTaskService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectprocessscantask")
 public class ProjectProcessScanTaskController {
-    
+
     @Autowired
     private ProjectProcessScanTaskService projectProcessScanTaskService;
 
@@ -91,4 +91,4 @@ public class ProjectProcessScanTaskController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectProcessScanTaskExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectRelatedPersonnelController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectRelatedPersonnelController.java
index b23ff79827..4efd4218d5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectRelatedPersonnelController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectRelatedPersonnelController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectRelatedPersonnelDTO;
 import com.epmet.excel.ProjectRelatedPersonnelExcel;
 import com.epmet.service.ProjectRelatedPersonnelService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectrelatedpersonnel")
 public class ProjectRelatedPersonnelController {
-    
+
     @Autowired
     private ProjectRelatedPersonnelService projectRelatedPersonnelService;
 
@@ -91,4 +91,4 @@ public class ProjectRelatedPersonnelController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectRelatedPersonnelExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
index ac8d77458a..30216ad81e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
 import com.epmet.dto.form.ProjectEvaluateFormDTO;
 import com.epmet.dto.form.ProjectEvaluationListFormDTO;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectsatisfactiondetail")
 public class ProjectSatisfactionDetailController {
-    
+
     @Autowired
     private ProjectSatisfactionDetailService projectSatisfactionDetailService;
 
@@ -138,4 +138,4 @@ public class ProjectSatisfactionDetailController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
index 62fbe24a59..0412f1fb6e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
 import com.epmet.dto.form.MassesDiscontentFormDTO;
 import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
@@ -49,7 +49,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectsatisfactionstatistics")
 public class ProjectSatisfactionStatisticsController {
-    
+
     @Autowired
     private ProjectSatisfactionStatisticsService projectSatisfactionStatisticsService;
 
@@ -119,4 +119,4 @@ public class ProjectSatisfactionStatisticsController {
         return new Result<List<MassesDiscontentResultDTO>>().ok(projectSatisfactionStatisticsService.massesDiscontent(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java
index dbe6fef069..5dddd7e21d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.excel.ProjectStaffExcel;
 import com.epmet.service.ProjectStaffService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectstaff")
 public class ProjectStaffController {
-    
+
     @Autowired
     private ProjectStaffService projectStaffService;
 
@@ -91,4 +91,4 @@ public class ProjectStaffController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectStaffExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
index 2610167069..1aebe7b1d7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
@@ -24,7 +24,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 项目客户参数订制表
@@ -89,4 +88,4 @@ public interface CustomerProjectParameterDao extends BaseDao<CustomerProjectPara
 	 * @return java.lang.String
 	 */
 	String selectValueByKey(@Param("customerId") String customerId, @Param("key") String key);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java
index 4ba3580b45..e3b79d501c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java
@@ -6,7 +6,6 @@ import com.epmet.entity.MemoAttrEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,4 +28,4 @@ public interface MemoAttrDao extends BaseDao<MemoAttrEntity> {
      * @Description 查询某个人当前日期之后，当日0点之前待提醒时间节点列表
      **/
     List<String> memoTime(@Param("userId") String userId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java
index 032be5b4fe..2707c47b51 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java
@@ -2,7 +2,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.MemoDifficultyDTO;
-import com.epmet.dto.MemoWorkDiaryDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
 import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.entity.MemoDifficultyEntity;
@@ -27,4 +26,4 @@ public interface MemoDifficultyDao extends BaseDao<MemoDifficultyEntity> {
     List<MemoDifficultyDTO> getPage(MemoDifficultyFormDTO formDTO);
 
     AddMemoDifficultyFromDTO selectByDifficutyId(@Param("id") String id);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
index 3aaabdf485..5d1a7d578e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
@@ -21,7 +21,10 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.EventProjectInfoDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.ProjectStaffDTO;
-import com.epmet.dto.form.*;
+import com.epmet.dto.form.LatestListFormDTO;
+import com.epmet.dto.form.PatrolProjectFormDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.form.ShiftProjectsFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -297,4 +300,4 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 */
 	Integer selectEventStatus(@Param("gridId") String gridId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
index d015d6900c..ca0c2a492e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
@@ -20,9 +20,9 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.ProjectEvaluationListFormDTO;
 import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.ProjectEvaluateDetailResultDTO;
 import com.epmet.dto.result.ProjectEvaluateInfoResultDTO;
-import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.ProjectEvaluationListResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -69,4 +69,4 @@ public interface ProjectSatisfactionDetailDao extends BaseDao<ProjectSatisfactio
      */
     List<ProjectEvaluateDetailResultDTO> selectProjectEvaluateDetail(@Param("projectIds")List<String> projectIds);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
index 89e4d5049e..b542375f7b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.MassesDiscontentResultDTO;
-import com.epmet.dto.result.ProjectScoreResultDTO;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,4 +75,4 @@ public interface ProjectSatisfactionStatisticsDao extends BaseDao<ProjectSatisfa
      */
     List<MassesDiscontentResultDTO> selectProjectByScore(@Param("projectIds")List<String> projectIds, @Param("setScore")Integer setScore, @Param("sortType")String sortType);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java
index 5d5a578320..b8864f5376 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目客户参数订制表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java
index c5d81f90fa..cc58fde4a8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java
@@ -5,8 +5,6 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 备忘录-工作日志
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java
index f1fc7eb4e8..d59484e33c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目所属分类表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java
index e541e454fa..a842346878 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java
@@ -20,7 +20,6 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessAttachmentEntity.java
index 1515cbfe98..123110b61b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessAttachmentEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目节点附件表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
index 9569803906..a67f6b7eee 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessScanTaskEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessScanTaskEntity.java
index bd4a6a41e5..bf007fac35 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessScanTaskEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessScanTaskEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目节点附件安全校验任务表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java
index 6291ac0d65..7699c5f89c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目相关人员表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java
index 3947ab57a4..4db81b810d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目满意度调查记录表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
index c55338cf80..e1b7383644 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
@@ -20,14 +20,11 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目满意度调查统计表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
index 0ad284d6a0..afd17d5d43 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目人员关联表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java
index f0f0ac20ba..4b6584558f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubAttachmentEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 外部系统事件附件 
+ * 外部系统事件附件
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-17
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
index bee3af437b..040674d7dc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSubProcessEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +25,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 节点事件关联表 
+ * 节点事件关联表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-03-17
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java
index 12febddfea..2b64e78e0e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目关联标签表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java
index 658922b493..1c4119ff7b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 事件附件表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
index ee261096ad..2a332a2f2e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -124,7 +123,7 @@ public class ResiEventEntity extends BaseEpmetEntity {
 	private Boolean readFlag;
 
     /**
-     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; 
+     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1;
      */
 	private Boolean redDot;
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java
index e2c34cc30e..2ee9754c6b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java
index 2d597fd6e3..71828b3b26 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 事件回复表
  *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java
index 519dc8f18d..7e03e89b74 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java
@@ -20,7 +20,6 @@ package com.epmet.redis;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.dto.form.VoteRedisFormDTO;
-import com.epmet.issue.constant.IssueConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -70,4 +69,4 @@ public class ProjectRedis {
         return voteRedisFormDTO;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java
index a016573e03..bb0bce90cd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java
@@ -4,8 +4,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.MemoDifficultyDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
-import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
+import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.entity.MemoDifficultyEntity;
 
 import java.util.List;
@@ -85,4 +85,4 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
      * @date 2022-03-15
      */
     AddMemoDifficultyFromDTO detail(MemoDifficultyDetailFromDTO fromDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
index 1457866c04..2b138c7890 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
@@ -21,10 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluationListFormDTO;
-import com.epmet.dto.form.ProjectEvaluationListFormDTO;
-import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
 import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.ProjectEvaluationListResultDTO;
 import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
@@ -136,4 +136,4 @@ public interface ProjectSatisfactionDetailService extends BaseService<ProjectSat
      * @date 2021/5/12 10:04 上午
      */
     void complementedProjectEvaluate();
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
index fa4f17266d..eb0d11a908 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
@@ -26,7 +26,6 @@ import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffUnHandledDTO;
 import com.epmet.entity.ProjectStaffEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -180,4 +179,4 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
      **/
     List<com.epmet.dto.result.ProjectOrgPeriodResultDTO> selectProjectOrgPeriod(String customerId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
index d28f2c11a1..6433bb48e2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
@@ -7,7 +7,6 @@ import com.epmet.dto.form.*;
 import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
-import com.epmet.feign.EpmetThirdOpenFeignClient;
 import com.epmet.feign.ThirdOpenFeignClient;
 import com.epmet.service.BlockChainUploadService;
 import lombok.extern.slf4j.Slf4j;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index 6142562041..75c1436a25 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ParameterKeyConstant;
 import com.epmet.constant.ThirdPlatformActions;
@@ -382,4 +382,4 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
 
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
index 2ac7232763..8128e954f5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
@@ -11,8 +11,8 @@ import com.epmet.dto.MemoAttachmentDTO;
 import com.epmet.dto.MemoAttrDTO;
 import com.epmet.dto.MemoDifficultyDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
-import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
+import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.entity.MemoAttachmentEntity;
 import com.epmet.entity.MemoAttrEntity;
 import com.epmet.entity.MemoDifficultyEntity;
@@ -21,7 +21,6 @@ import com.epmet.service.MemoAttrService;
 import com.epmet.service.MemoDifficultyService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import oracle.sql.NUMBER;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -158,4 +157,4 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
         return resultDTO;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessAttachmentServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessAttachmentServiceImpl.java
index cecb5cba05..c11515ba91 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessAttachmentServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessAttachmentServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ProjectProcessAttachmentDao;
 import com.epmet.dto.ProjectProcessAttachmentDTO;
 import com.epmet.entity.ProjectProcessAttachmentEntity;
@@ -101,4 +101,4 @@ public class ProjectProcessAttachmentServiceImpl extends BaseServiceImpl<Project
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessScanTaskServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessScanTaskServiceImpl.java
index 34d303c6f7..f2bc49262f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessScanTaskServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessScanTaskServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ProjectProcessScanTaskDao;
 import com.epmet.dto.ProjectProcessScanTaskDTO;
 import com.epmet.entity.ProjectProcessScanTaskEntity;
@@ -101,4 +101,4 @@ public class ProjectProcessScanTaskServiceImpl extends BaseServiceImpl<ProjectPr
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index e7932e3303..902fb92e6f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -38,10 +38,6 @@ import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.*;
-import com.epmet.constant.ProjectConstant;
-import com.epmet.constant.ReadFlagConstant;
-import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessDao;
@@ -56,12 +52,7 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectOrgRelationEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
-import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.*;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.BlockChainUploadService;
@@ -830,4 +821,4 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         return platFormIds;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectRelatedPersonnelServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectRelatedPersonnelServiceImpl.java
index a4b06bb1ed..f7ae29c495 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ProjectRelatedPersonnelDao;
 import com.epmet.dto.ProjectRelatedPersonnelDTO;
 import com.epmet.entity.ProjectRelatedPersonnelEntity;
@@ -106,4 +106,4 @@ public class ProjectRelatedPersonnelServiceImpl extends BaseServiceImpl<ProjectR
         return baseDao.selectPersonnelListByProjectId(projectId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
index 1daf62891f..a7aaf58dae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
@@ -20,11 +20,11 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ProjectConstant;
@@ -37,7 +37,6 @@ import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
 import com.epmet.dto.result.MassesDiscontentResultDTO;
 import com.epmet.dto.result.ProjectCategoryDisPoseResultDTO;
 import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
-import com.epmet.dto.result.ProjectScoreResultDTO;
 import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
@@ -246,4 +245,4 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
         return result;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
index 9ef8a2dc14..76fef67db4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -30,7 +30,6 @@ import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.TransferOptionalStaffListFormDTO;
-
 import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffUnHandledDTO;
@@ -201,4 +200,4 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
         return baseDao.selectProjectOrgPeriod(customerId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
index 41bba0364a..fe99fa2445 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
@@ -20,10 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectTagsDao;
 import com.epmet.dto.ProjectTagsDTO;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 7a0b19a9fc..e7d64d99fe 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -19,11 +19,8 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
@@ -328,4 +325,4 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
 
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleCoverDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleCoverDTO.java
index ad9e063b58..e77b0ed561 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleCoverDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleCoverDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class ArticleCoverDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleOperateRecordDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleOperateRecordDTO.java
index 2bc20ce5ae..6fd24c6024 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleOperateRecordDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleOperateRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ArticleOperateRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleTagsDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleTagsDTO.java
index 0db5cd3f30..ff7ddd5cac 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleTagsDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleTagsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ArticleTagsDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleVisitRecordDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleVisitRecordDTO.java
index 4ac7e6a720..291bf03412 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleVisitRecordDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticleVisitRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ArticleVisitRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftCoverDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftCoverDTO.java
index e3b5c98a04..ec9768e9d7 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftCoverDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftCoverDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class DraftCoverDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java
index 6b9dbfaeee..23b34575da 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideCollectionDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class GuideCollectionDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
index 39612bb4ff..4d29466d05 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideExternalLinkDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class GuideExternalLinkDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java
index 40e4fed74e..4ee7bef365 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -54,7 +55,7 @@ public class GuideModuleDTO implements Serializable {
 	private String moduleId;
 
     /**
-     * 
+     *
      */
 	private String moduleContent;
 
@@ -88,4 +89,4 @@ public class GuideModuleDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java
index 938e7b211a..be27aeb411 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class GuideModuleDictDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java
index 6c59d906f9..586de60a06 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideModuleDictDefaultDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class GuideModuleDictDefaultDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java
index 33415b9d95..0e7f1a5e20 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagCustomerDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class TagCustomerDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagDefaultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagDefaultDTO.java
index 5a0a6524a7..dd22cd73fe 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagDefaultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagDefaultDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -73,4 +74,4 @@ public class TagDefaultDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagGridDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagGridDTO.java
index d5a6ae2760..917e73fc43 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagGridDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagGridDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class TagGridDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java
index 48bfde8f04..edbfbb42e5 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/GuideFormDTO.java
@@ -1,14 +1,10 @@
 package com.epmet.dto.form;
 
-import com.epmet.dto.ExternalLinkDTO;
-import com.epmet.dto.GuideAttachmentDTO;
-import com.epmet.dto.ModuleDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/OffLineArticleFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/OffLineArticleFormDTO.java
index bda7f57c9f..8f6a14a178 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/OffLineArticleFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/OffLineArticleFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java
index 3186b08037..a9ad61ecc6 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 党建声音-可下线网格列表-接口入参
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishedListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishedListFormDTO.java
index a4a514c06f..59e011c829 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishedListFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishedListFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java
index bfad56b2f5..fa7cf9e88e 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java
@@ -5,7 +5,6 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.fallback.GovVoiceOpenFeignClientFallback;
 import com.epmet.feign.fallback.GovVoiceOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java
index 86af110762..9801756745 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java
@@ -6,7 +6,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovVoiceOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
index 1650ee5fb2..79b63f91f6 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
@@ -16,14 +16,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.annotation.DataFilter;
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.SubjectArticleListFormDTO;
-import com.epmet.dto.result.*;
 import com.epmet.dto.form.ResiTagListFormDTO;
-import com.epmet.dto.result.GovArticleContentDTO;
-import com.epmet.dto.result.GovArticleDetailResultDTO;
-import com.epmet.dto.result.ArticleBannerResultDTO;
-import com.epmet.dto.result.ArticleDetailResultDTO;
-import com.epmet.dto.result.ArticleLatestResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ArticleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleCoverEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleCoverEntity.java
index 9e7d6c8751..770e512d18 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleCoverEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleCoverEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 文章封面表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java
index 1328aa6f1e..e6961013c2 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleTagsEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleTagsEntity.java
index af09af33fd..208a8a1f8d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleTagsEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleTagsEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 文章标签表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleVisitRecordEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleVisitRecordEntity.java
index 6805243128..d182ead18c 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleVisitRecordEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleVisitRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 文章访问记录表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftCoverEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftCoverEntity.java
index b7cd32ccd3..0377937b2d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftCoverEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftCoverEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 草稿封面表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java
index 861b80c239..cb5d1f5251 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java
index f522884f79..6621723267 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideCollectionEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 指南收藏表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java
index f01788acdc..25dfc3130c 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictDefaultEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 指南模块默认字典表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java
index 2816effef0..ccbf02fd4c 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleDictEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 指南模块字典表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java
index 35d602602e..6eefa2ed34 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/GuideModuleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 指南模块关联表
  *
@@ -54,7 +51,7 @@ public class GuideModuleEntity extends BaseEpmetEntity {
 	private String moduleId;
 
     /**
-     * 
+     *
      */
 	private String moduleContent;
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagDefaultEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagDefaultEntity.java
index 479d068761..842353ac1b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagDefaultEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagDefaultEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 默认标签表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagGridEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagGridEntity.java
index 507aed9cd0..9400d2dc75 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagGridEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagGridEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 网格标签表
  *
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java
index 8fa6bd1aa7..a469994406 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java
@@ -21,9 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.SpecialSubjectDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.AddSpecialSubjectResultDTO;
 import com.epmet.dto.result.PreviewResultDTO;
 import com.epmet.dto.result.TagInfoResultDTO;
-import com.epmet.dto.result.AddSpecialSubjectResultDTO;
 import com.epmet.dto.result.WorkSpecialSubjectResultDTO;
 import com.epmet.entity.SpecialSubjectEntity;
 
@@ -136,7 +136,7 @@ public interface SpecialSubjectService extends BaseService<SpecialSubjectEntity>
      * @date 2021-07-15
      */
     List<WorkSpecialSubjectResultDTO> queryExistedList(QuerySpecialSubFormDTO formDTO);
-    
+
     /**
      * 效果预览
      * @author zhaoqifeng
@@ -145,4 +145,4 @@ public interface SpecialSubjectService extends BaseService<SpecialSubjectEntity>
      * @return java.util.List<com.epmet.dto.result.PreviewResultDTO>
      */
     List<PreviewResultDTO> preview(PreviewFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
index 91b8c0521a..f5505ae5a4 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java
@@ -34,7 +34,10 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.SpecialSubjectDTO;
 import com.epmet.dto.TagCustomerDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.AddSpecialSubjectResultDTO;
+import com.epmet.dto.result.PreviewResultDTO;
+import com.epmet.dto.result.TagInfoResultDTO;
+import com.epmet.dto.result.WorkSpecialSubjectResultDTO;
 import com.epmet.entity.SpecialSubjectEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.redis.TagRedis;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java
index 979919af85..9976afded6 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.opendata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperLanguageDTO.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperLanguageDTO.java
index 506e1885b6..8b41b613a5 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperLanguageDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperLanguageDTO.java
@@ -17,10 +17,10 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
+
 
 /**
  * 国际化
@@ -58,4 +58,4 @@ public class OperLanguageDTO implements Serializable {
      */
 	private String language;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperMenuDTO.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperMenuDTO.java
index cdbc9567c2..24f3a56d77 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperMenuDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperMenuDTO.java
@@ -17,14 +17,14 @@
 
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.epmet.commons.tools.utils.TreeStringNode;
 import com.epmet.dto.result.MenuResourceDTO;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 
 /**
  * 菜单管理
@@ -121,4 +121,4 @@ public class OperMenuDTO extends TreeStringNode<OperMenuDTO> implements Serializ
 	 * 是否显示，1：显示 0不显示
 	 */
 	private Integer showFlag;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperResourceDTO.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperResourceDTO.java
index 9a1cd25769..973d0f79fd 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperResourceDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperResourceDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class OperResourceDTO implements Serializable {
 	 */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleDTO.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleDTO.java
index 3a60a013cc..17c5c517a2 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleDTO.java
@@ -17,12 +17,12 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import lombok.Data;
-
 
 /**
  * 角色管理
@@ -90,4 +90,4 @@ public class OperRoleDTO implements Serializable {
 	 */
 	private List<String> menuIdList;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleMenuDTO.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleMenuDTO.java
index 334ef8cf38..c3431c2ded 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleMenuDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleMenuDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class OperRoleMenuDTO implements Serializable {
 	 */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleUserDTO.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleUserDTO.java
index 51bd851cc2..9a4c73f040 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleUserDTO.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperRoleUserDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class OperRoleUserDTO implements Serializable {
 	 */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessOpenFeignClient.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessOpenFeignClient.java
index c89b3f39c9..9e5a1b0771 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessOpenFeignClient.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessOpenFeignClient.java
@@ -1,13 +1,11 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.fallback.OperAccessOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.feign.fallback.OperAccessOpenFeignClientFallback;
-
 /**
  * @Description 运营端权限模块
  * @Author yinzuomei
diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessOpenFeignClientFallback.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessOpenFeignClientFallback.java
index b062f8f372..46c4b182eb 100644
--- a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessOpenFeignClientFallback.java
+++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessOpenFeignClientFallback.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.OperAccessOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 /**
  * @Description 运营端权限模块
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperLanguageController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperLanguageController.java
index af0772f36d..bfd215041a 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperLanguageController.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperLanguageController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.OperLanguageDTO;
 import com.epmet.excel.OperLanguageExcel;
 import com.epmet.service.OperLanguageService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("operlanguage")
 public class OperLanguageController {
-    
+
     @Autowired
     private OperLanguageService operLanguageService;
 
@@ -91,4 +91,4 @@ public class OperLanguageController {
         ExcelUtils.exportExcelToTarget(response, null, list, OperLanguageExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperResourceController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperResourceController.java
index 160079f2dd..88cd2c9866 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperResourceController.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperResourceController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.OperResourceDTO;
 import com.epmet.excel.OperResourceExcel;
 import com.epmet.service.OperResourceService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("operresource")
 public class OperResourceController {
-    
+
     @Autowired
     private OperResourceService operResourceService;
 
@@ -91,4 +91,4 @@ public class OperResourceController {
         ExcelUtils.exportExcelToTarget(response, null, list, OperResourceExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java
index e4ff35888b..8bb1a2ba97 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.OperRoleMenuDTO;
 import com.epmet.excel.OperRoleMenuExcel;
 import com.epmet.service.OperRoleMenuService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("operrolemenu")
 public class OperRoleMenuController {
-    
+
     @Autowired
     private OperRoleMenuService operRoleMenuService;
 
@@ -91,4 +91,4 @@ public class OperRoleMenuController {
         ExcelUtils.exportExcelToTarget(response, null, list, OperRoleMenuExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java
index 1581731ce2..2243d789d1 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.OperRoleUserDTO;
 import com.epmet.excel.OperRoleUserExcel;
 import com.epmet.service.OperRoleUserService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("operroleuser")
 public class OperRoleUserController {
-    
+
     @Autowired
     private OperRoleUserService operRoleUserService;
 
@@ -137,4 +137,4 @@ public class OperRoleUserController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java
index b1f69647c7..ddf13d60ec 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java
@@ -8,15 +8,12 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 菜单管理
  *
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java
index d10956ac72..7afd722bd2 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java
@@ -8,15 +8,11 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 资源管理
  *
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java
index 527bdcc387..7fd5393e7e 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java
@@ -15,8 +15,6 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 角色管理
  *
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java
index 7d32968ef8..650619ffa9 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java
@@ -9,7 +9,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.epmet.commons.mybatis.entity.BaseEntity;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/excel/OperLanguageExcel.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/excel/OperLanguageExcel.java
index 13c8cc8ccf..6ab7a35ee8 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/excel/OperLanguageExcel.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/excel/OperLanguageExcel.java
@@ -20,8 +20,6 @@ package com.epmet.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 国际化
  *
@@ -47,4 +45,4 @@ public class OperLanguageExcel {
     private String language;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 1fcb51ffca..0a23121654 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -5,7 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.OperUserDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java
index fd62682467..54e3a58067 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java
@@ -20,9 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.dto.OperMenuDTO;
-import com.epmet.dto.form.UserInfoDto;
 import com.epmet.entity.OperMenuEntity;
 
 import java.util.List;
@@ -143,4 +141,4 @@ public interface OperMenuService extends BaseService<OperMenuEntity> {
     List<OperMenuDTO> getListPid(String pid);
 
     void clearOperUserAccess(String app, String client, String userId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
index 7ed89ecf7b..2d7a0513b5 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperLanguageDao;
 import com.epmet.dto.OperLanguageDTO;
 import com.epmet.entity.OperLanguageEntity;
@@ -118,4 +118,4 @@ public class OperLanguageServiceImpl extends BaseServiceImpl<OperLanguageDao, Op
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
index df8c7fc154..d83970486c 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
@@ -21,21 +21,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.enums.SuperAdminEnum;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.security.user.SecurityUser;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpContextUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.TreeUtils;
 import com.epmet.dao.OperMenuDao;
 import com.epmet.dto.OperMenuDTO;
 import com.epmet.dto.OperUserDTO;
-import com.epmet.dto.form.UserInfoDto;
 import com.epmet.entity.OperMenuEntity;
 import com.epmet.enums.MenuTypeEnum;
 import com.epmet.feign.EpmetUserFeignClient;
@@ -251,4 +249,4 @@ public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEn
         operLanguageService.saveOrUpdate("oper_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage());
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java
index 95fb5d937c..147205ea9c 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java
@@ -21,10 +21,10 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.enums.ResourceAuthEnum;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperResourceDao;
 import com.epmet.dto.OperResourceDTO;
 import com.epmet.dto.result.MenuResourceDTO;
@@ -140,4 +140,4 @@ public class OperResourceServiceImpl extends BaseServiceImpl<OperResourceDao, Op
         return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java
index 0897d62367..c61b43555a 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java
@@ -21,9 +21,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperRoleMenuDao;
 import com.epmet.dto.OperRoleMenuDTO;
 import com.epmet.entity.OperRoleMenuEntity;
@@ -147,4 +147,4 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl<OperRoleMenuDao, Op
     public void deleteByMenuId(String menuId) {
         baseDao.deleteByMenuId(menuId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleServiceImpl.java
index e766957b5b..7af5d774c6 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperRoleDao;
 import com.epmet.dto.OperRoleDTO;
 import com.epmet.entity.OperRoleEntity;
@@ -115,4 +115,4 @@ public class OperRoleServiceImpl extends BaseServiceImpl<OperRoleDao, OperRoleEn
         operRoleUserService.deleteByRoleIds(ids);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleUserServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleUserServiceImpl.java
index cff40398a4..e4f762091d 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleUserServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleUserServiceImpl.java
@@ -21,9 +21,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperRoleUserDao;
 import com.epmet.dto.OperRoleUserDTO;
 import com.epmet.entity.OperRoleUserEntity;
@@ -153,4 +153,4 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, Op
         operRoleUserDao.deleteByUserIds(userIds);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerInitFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerInitFormDTO.java
index 93f5146e40..04a40b5871 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerInitFormDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerInitFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 运营端-初始化在公众号注册的客户-接口入参
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/PageQueryFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/PageQueryFormDTO.java
index 3067956e2e..3226ed6be1 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/PageQueryFormDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/PageQueryFormDTO.java
@@ -3,9 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 运营端-客户列表查询-接口入参
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
index 500e09eaca..c6fc44b140 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
@@ -9,7 +9,6 @@ import com.epmet.dto.result.CrmParameterResultDTO;
 import com.epmet.dto.result.CustomerRelationInfoResultDTO;
 import com.epmet.dto.result.GridCountResultDTO;
 import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
-import com.epmet.feign.fallback.OperCrmOpenFeignClientFallback;
 import com.epmet.feign.fallback.OperCrmOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
index c25fbcfc25..8366657fa8 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
@@ -11,7 +11,6 @@ import com.epmet.dto.result.CustomerRelationInfoResultDTO;
 import com.epmet.dto.result.GridCountResultDTO;
 import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
 import com.epmet.feign.OperCrmOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerThirdplatApiserviceEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerThirdplatApiserviceEntity.java
index 59be94ffb9..ff88b87ae3 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerThirdplatApiserviceEntity.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerThirdplatApiserviceEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户所属的第三方平台的apiService列表
  *
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
index 59a9876535..7a1ee97146 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerThirdplatApiServiceService.java
@@ -1,9 +1,6 @@
 package com.epmet.service;
 
 import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
-import com.epmet.entity.CustomerThirdplatApiserviceEntity;
-
-import java.util.List;
 
 public interface CustomerThirdplatApiServiceService {
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
index 197427b7ae..9f895d2173 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerThirdplatApiServiceServiceImpl.java
@@ -8,12 +8,9 @@ import com.epmet.dao.CustomerThirdplatApiserviceDao;
 import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
 import com.epmet.service.CustomerThirdplatApiServiceService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 @Service
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDTO.java
index 7be2dc4672..6898d94c53 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDetailDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDetailDTO.java
index 8f2d7d09b7..8da1b84591 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDetailDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionRoleDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionRoleDTO.java
index 548e8b9996..a046804d93 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionRoleDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionRoleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -39,7 +40,7 @@ public class CustomerFunctionRoleDTO implements Serializable {
 	private String id;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
@@ -93,4 +94,4 @@ public class CustomerFunctionRoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDTO.java
index ddac98258d..6bf7ec6398 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 客户首页表 
+ * 客户首页表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -83,4 +84,4 @@ public class CustomerHomeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java
index 1081a4e145..4be7d27f3e 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeTemplateDTO.java
index 866adac425..12a1cc0cc0 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeTemplateDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeTemplateDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java
index 35bb386820..97fdde3122 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerStartPageDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class CustomerStartPageDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedDTO.java
index 9fb059d520..d274102898 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 定制功能 
+ * 定制功能
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-08-11
@@ -103,4 +104,4 @@ public class FunctionCustomizedDTO implements Serializable {
      */
 	private String fromApp;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedVisitedDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedVisitedDTO.java
index 84d2b50095..9aee1c6259 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedVisitedDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionCustomizedVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class FunctionCustomizedVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java
index 9b581662e4..fd07de37df 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionShoppingHistoryDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionShoppingHistoryDTO.java
index 3426469343..1f7b3b39b7 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionShoppingHistoryDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionShoppingHistoryDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java
index 2845fd46b7..24b14891bc 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java
index ee14093ab1..99dc0e3438 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class IcFormDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java
index 5505ef21dd..4d0e3947fc 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class IcFormItemOptionsDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcIndividualCategoryManageDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcIndividualCategoryManageDTO.java
index 372864b7f0..34fbb2ef88 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcIndividualCategoryManageDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcIndividualCategoryManageDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -32,7 +33,7 @@ public class IcIndividualCategoryManageDTO implements Serializable {
 	private String userId;
 
     /**
-     * 
+     *
      */
 	private String columnId;
 
@@ -71,4 +72,4 @@ public class IcIndividualCategoryManageDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryStatsConfigDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryStatsConfigDTO.java
index 1eb4516551..93dea8343e 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryStatsConfigDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryStatsConfigDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class IcResiCategoryStatsConfigDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java
index c7ef3d17f8..5d6186c6fd 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -112,4 +113,4 @@ public class IcResiCategoryWarnConfigDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java
index 9db82e8d48..0ce87e9b92 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class ItemTypeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionRoleListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionRoleListFormDTO.java
index 717e0d3c46..e53f59c445 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionRoleListFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionRoleListFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 查询客户定制功能角色列表--接口入参
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
index e3e441283f..eae2276155 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java
index f7fa5bb1da..8ec7ed10c2 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java
@@ -12,16 +12,24 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 public class IcFormOptionsQueryFormDTO {
-    
+
     public interface QueryByLabelAndCustomerIdForForm {}
-    
+
     @NotBlank(message = "客户ID必填", groups = { QueryByLabelAndCustomerIdForForm.class })
     private String customerId;
 
     @NotBlank(message = "FormCode必填", groups = { QueryByLabelAndCustomerIdForForm.class })
     private String formCode;
 
+    /**
+     * 列名单纯的列名，如果是扩展字段则 需要给columnNum赋值
+     */
     @NotBlank(message = "OptionsLabel必填", groups = { QueryByLabelAndCustomerIdForForm.class })
-    private String label;
-    
+    private String columnName;
+
+    /**
+     * 列名数字
+     */
+    private Integer columnNum;
+
 }
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java
index cc036df66f..7d10474443 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java
@@ -22,7 +22,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -76,4 +75,4 @@ public class IcResiCategoryStatsConfigFormDTO implements Serializable {
 
     private Integer level3;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigSortFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigSortFormDTO.java
index 9e843dd7da..8b26a057e2 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigSortFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigSortFormDTO.java
@@ -17,7 +17,6 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -49,4 +48,4 @@ public class IcResiCategoryStatsConfigSortFormDTO implements Serializable {
 	private Integer sort;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/QueryFunctionListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/QueryFunctionListFormDTO.java
index 9e30e726b1..03ae20c63e 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/QueryFunctionListFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/QueryFunctionListFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ResiCategoryStatsConfigListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ResiCategoryStatsConfigListFormDTO.java
index 96401a3029..9a64c9386b 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ResiCategoryStatsConfigListFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ResiCategoryStatsConfigListFormDTO.java
@@ -17,10 +17,8 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 
@@ -45,4 +43,4 @@ public class ResiCategoryStatsConfigListFormDTO implements Serializable {
      */
     private Integer level;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java
index e9fbe3c0ed..013c618870 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 定制功能新增  入参
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java
index 819d03b563..90cc898cbd 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/StartPageFromDTO.java
@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 运营端-启动页查询-接口入参
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionRoleListResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionRoleListResultDTO.java
index cbb4db6fb8..659283c922 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionRoleListResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionRoleListResultDTO.java
@@ -1,9 +1,7 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.form.RoleListFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java
index 162ce43cd0..43c48d1711 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @Description 运营端-客户定制功能列表-接口返参
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionDetailResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionDetailResultDTO.java
index ebbcd3ea9b..297ac88b22 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionDetailResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionDetailResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 
 /**
  * 查询客户定制功能列表-接口返参
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionResultDTO.java
index 7c211434c6..d5760fdd53 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionResultDTO.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @Description 运营端-客户定制功能列表-接口返参
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java
index 4c1ad37e76..0c0c6fa10f 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeDesignByCustomerResultDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Description 运营端-客户定制化服务-获取客户首页配置的设计稿返参 (/oper/customize/customerhometemplate/gethometemplate接口也用的此DTO)
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java
index d9199b99cc..e161b60f6d 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -85,4 +84,4 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable {
      * 等级3阈值
      */
     private Integer level3;
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java
index 3a69b6da62..07cf075fd2 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java
@@ -18,7 +18,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionRoleController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionRoleController.java
index 7ed5dc4b50..0e7b32f795 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionRoleController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionRoleController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerFunctionRoleDTO;
 import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
 import com.epmet.dto.form.SaveCustomerFunctionRoleFormDTO;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerfunctionrole")
 public class CustomerFunctionRoleController {
-    
+
     @Autowired
     private CustomerFunctionRoleService customerFunctionRoleService;
 
@@ -120,4 +120,4 @@ public class CustomerFunctionRoleController {
         ValidatorUtils.validateEntity(formDTO, CustomerFunctionRoleListFormDTO.AddUserInternalGroup.class);
         return new Result<List<CustomerFunctionRoleListResultDTO>>().ok(customerFunctionRoleService.customerFunctionRoleList(formDTO));
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeController.java
index b8bd95073c..1d351e4eae 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerHomeDTO;
 import com.epmet.excel.CustomerHomeExcel;
 import com.epmet.service.CustomerHomeService;
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 客户首页表 
+ * 客户首页表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerhome")
 public class CustomerHomeController {
-    
+
     @Autowired
     private CustomerHomeService customerHomeService;
 
@@ -105,4 +105,4 @@ public class CustomerHomeController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeDetailController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeDetailController.java
index 6d1159b815..765c0ed025 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeDetailController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeDetailController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerHomeDetailDTO;
 import com.epmet.excel.CustomerHomeDetailExcel;
 import com.epmet.service.CustomerHomeDetailService;
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 客户首页详情表 
+ * 客户首页详情表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerhomedetail")
 public class CustomerHomeDetailController {
-    
+
     @Autowired
     private CustomerHomeDetailService customerHomeDetailService;
 
@@ -91,4 +91,4 @@ public class CustomerHomeDetailController {
         ExcelUtils.exportExcelToTarget(response, null, list, CustomerHomeDetailExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java
index 99fd872b92..99a5e3c909 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerHomeTemplateController.java
@@ -17,23 +17,20 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerHomeTemplateDTO;
 import com.epmet.dto.form.HomeTemplateCommonFormDTO;
 import com.epmet.dto.result.ComponentListByCustomerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
 import com.epmet.excel.CustomerHomeTemplateExcel;
 import com.epmet.service.CustomerHomeTemplateService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,7 +40,7 @@ import java.util.Map;
 
 
 /**
- * 客户首页模板表 
+ * 客户首页模板表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -51,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerhometemplate")
 public class CustomerHomeTemplateController {
-    
+
     @Autowired
     private CustomerHomeTemplateService customerHomeTemplateService;
 
@@ -135,4 +132,4 @@ public class CustomerHomeTemplateController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java
index c90599c1ae..aaa20260ce 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerStartPageController.java
@@ -17,7 +17,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -135,4 +134,4 @@ public class CustomerStartPageController {
         return new Result<HomeStartPageResultDTO>().ok(customerStartPageService.homeStartPage(fromDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
index f217afd16c..6e1e5390f5 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.FunctionCustomizedDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.FunctionCustomizedDetailResultDTO;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedVisitedController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedVisitedController.java
index faea8de9e9..bfe23d71a2 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedVisitedController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedVisitedController.java
@@ -25,10 +25,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.FunctionCustomizedVisitedDTO;
-import com.epmet.dto.form.FunctionDetailFromDTO;
 import com.epmet.dto.form.FunctionVisitedFromDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.excel.FunctionCustomizedVisitedExcel;
@@ -50,7 +49,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("functioncustomizedvisited")
 public class FunctionCustomizedVisitedController {
-    
+
     @Autowired
     private FunctionCustomizedVisitedService functionCustomizedVisitedService;
 
@@ -125,4 +124,4 @@ public class FunctionCustomizedVisitedController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionShoppingHistoryController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionShoppingHistoryController.java
index 51e1c62815..bde320a196 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionShoppingHistoryController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionShoppingHistoryController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.FunctionShoppingHistoryDTO;
 import com.epmet.excel.FunctionShoppingHistoryExcel;
 import com.epmet.service.FunctionShoppingHistoryService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("functionshoppinghistory")
 public class FunctionShoppingHistoryController {
-    
+
     @Autowired
     private FunctionShoppingHistoryService functionShoppingHistoryService;
 
@@ -91,4 +91,4 @@ public class FunctionShoppingHistoryController {
         ExcelUtils.exportExcelToTarget(response, null, list, FunctionShoppingHistoryExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeComponentController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeComponentController.java
index 83afe21184..97747ce61b 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeComponentController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeComponentController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.HomeComponentDTO;
 import com.epmet.excel.HomeComponentExcel;
 import com.epmet.service.HomeComponentService;
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 首页组件表 
+ * 首页组件表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("homecomponent")
 public class HomeComponentController {
-    
+
     @Autowired
     private HomeComponentService homeComponentService;
 
@@ -91,4 +91,4 @@ public class HomeComponentController {
         ExcelUtils.exportExcelToTarget(response, null, list, HomeComponentExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
index ed22604272..9f6f68e3a5 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
@@ -23,20 +23,18 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcFormItemOptionsDTO;
 import com.epmet.dto.form.IcFormOptionsQueryFormDTO;
 import com.epmet.excel.IcFormItemOptionsExcel;
 import com.epmet.service.IcFormItemOptionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.tags.form.InputTag;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
-import java.util.function.IntUnaryOperator;
 
 
 /**
@@ -48,7 +46,7 @@ import java.util.function.IntUnaryOperator;
 @RestController
 @RequestMapping("icformitemoptions")
 public class IcFormItemOptionsController {
-    
+
     @Autowired
     private IcFormItemOptionsService icFormItemOptionsService;
 
@@ -115,11 +113,12 @@ public class IcFormItemOptionsController {
         ValidatorUtils.validateEntity(input, IcFormOptionsQueryFormDTO.QueryByLabelAndCustomerIdForForm.class);
         String customerId = input.getCustomerId();
         String formCode = input.getFormCode();
-        String label = input.getLabel();
+        String columnName = input.getColumnName();
+        Integer columnNum = input.getColumnNum();
 
-        List<IcFormItemOptionsDTO> r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, label);
+        List<IcFormItemOptionsDTO> r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, columnName, columnNum);
         return new Result<List<IcFormItemOptionsDTO>>().ok(r);
     }
-    
 
-}
\ No newline at end of file
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java
index 9c90d1bb9b..0739891ca3 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java
@@ -4,17 +4,16 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.form.PackageEditIndividualCategoryFormDTO;
 import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.service.IcIndividualCategoryManageService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -27,7 +26,7 @@ import java.util.List;
 @RestController
 @RequestMapping("icindividualcategorymanage")
 public class IcIndividualCategoryManageController {
-    
+
     @Autowired
     private IcIndividualCategoryManageService icIndividualCategoryManageService;
 
@@ -68,4 +67,4 @@ public class IcIndividualCategoryManageController {
         return new Result<List<IndividualCategoryAllListResultDTO>>().ok(icIndividualCategoryManageService.individualCategoryAllList(tokenDto));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java
index 70880418dd..775001770f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.excel.IcResiCategoryStatsConfigExcel;
 import com.epmet.service.IcResiCategoryStatsConfigService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icresicategorystatsconfig")
 public class IcResiCategoryStatsConfigController {
-    
+
     @Autowired
     private IcResiCategoryStatsConfigService icResiCategoryStatsConfigService;
 
@@ -96,4 +96,4 @@ public class IcResiCategoryStatsConfigController {
         return new Result<List<IcResiCategoryStatsConfigDTO>>().ok(icResiCategoryStatsConfigService.getCategoryList(dto));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryWarnConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryWarnConfigController.java
index 004912ec40..fdfb2476dc 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryWarnConfigController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryWarnConfigController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.excel.IcResiCategoryWarnConfigExcel;
 import com.epmet.service.IcResiCategoryWarnConfigService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icresicategorywarnconfig")
 public class IcResiCategoryWarnConfigController {
-    
+
     @Autowired
     private IcResiCategoryWarnConfigService icResiCategoryWarnConfigService;
 
@@ -100,4 +100,4 @@ public class IcResiCategoryWarnConfigController {
         return new Result<List<IcResiCategoryWarnConfigDTO>>().ok(icResiCategoryWarnConfigService.categoryWarnConfigList(customerId));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java
index d5f5142c74..32e004027f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ItemTypeDTO;
 import com.epmet.excel.ItemTypeExcel;
 import com.epmet.service.ItemTypeService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("itemtype")
 public class ItemTypeController {
-    
+
     @Autowired
     private ItemTypeService itemTypeService;
 
@@ -91,4 +91,4 @@ public class ItemTypeController {
         ExcelUtils.exportExcelToTarget(response, null, list, ItemTypeExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java
index 8334159e8c..32fc58aae9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerFunctionDetailDTO;
-import com.epmet.dto.form.CustomerFunctionCollectFormDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
 import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
 import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionRoleDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionRoleDao.java
index 5a00d7e20a..b38f643fc3 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionRoleDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionRoleDao.java
@@ -18,14 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.CustomerFunctionRoleDTO;
 import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
 import com.epmet.dto.form.SaveCustomerFunctionRoleFormDTO;
 import com.epmet.dto.result.CustomerFunctionRoleListResultDTO;
 import com.epmet.entity.CustomerFunctionRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +57,4 @@ public interface CustomerFunctionRoleDao extends BaseDao<CustomerFunctionRoleEnt
      * @Description  根据用户拥有的角色查询客户的定制功能
      */
     List<String> selectFunctionList(FunctionDetailFromDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java
index f11dab0bc7..60282434c8 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeTemplateDao.java
@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.ComponentListByCustomerFormDTO;
 import com.epmet.dto.result.CommonComponentDesignResultDTO;
 import com.epmet.dto.result.CommonComponentResultDTO;
 import com.epmet.dto.result.FunctionComponentResultDTO;
@@ -83,4 +82,4 @@ public interface CustomerHomeTemplateDao extends BaseDao<CustomerHomeTemplateEnt
      * @Date 2020/8/24 22:35
      **/
     int deleteByClientType(@Param("clientType") String clientType,@Param("userId") String userId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionDetailEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionDetailEntity.java
index 53931cb040..514654b983 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionDetailEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionDetailEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户定制功能详情表
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionEntity.java
index cdc4a79963..68564b5ea7 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 客户功能权限表 
+ * 客户功能权限表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionRoleEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionRoleEntity.java
index 65a0c7ffc3..426fdeafc1 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionRoleEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionRoleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户定制功能角色列表
  *
@@ -39,7 +36,7 @@ public class CustomerFunctionRoleEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java
index 1bc64f2b91..12d5ce7778 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户首页详情表
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeEntity.java
index f1fbab1bc0..48e94209af 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 客户首页表 
+ * 客户首页表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeTemplateEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeTemplateEntity.java
index 36c677ef90..d9a1f138dd 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeTemplateEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeTemplateEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户首页模板表
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java
index 54912ab392..30a9d63750 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerStartPageEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 客户小程序启动页配置
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java
index 23aace2a98..4dcc5bd9c0 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 定制功能
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedVisitedEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedVisitedEntity.java
index 6e9dfb53cd..ca381131c7 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedVisitedEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedVisitedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 定制功能访问记录表 记录居民端、工作端那些人访问过定制功能以及访问的结果
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java
index 33c8431792..f7e0179e64 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 功能表 
+ * 功能表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionShoppingHistoryEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionShoppingHistoryEntity.java
index 6d8f479bac..d01354c1ad 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionShoppingHistoryEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionShoppingHistoryEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  客户定制功能上下架历史
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/HomeComponentEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/HomeComponentEntity.java
index 5cbb92b0c6..cc0b7e6068 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/HomeComponentEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/HomeComponentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 首页组件表
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java
index 4b53f0af6d..71c9d57357 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 配置表单
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java
index 1ef8d360db..51f3f1ce3f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 表单项的选项
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcIndividualCategoryManageEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcIndividualCategoryManageEntity.java
index 008cc40fd1..aac3e7d3b9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcIndividualCategoryManageEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcIndividualCategoryManageEntity.java
@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 个人分类管理
  *
@@ -32,7 +29,7 @@ public class IcIndividualCategoryManageEntity extends BaseEpmetEntity {
 	private String userId;
 
     /**
-     * 
+     *
      */
 	private String columnId;
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java
index 9175c282a6..066ae199db 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java
@@ -19,13 +19,10 @@ package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 居民类别预警配置表
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java
index 8c552c2f75..a83da6fc56 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 控件类型
  *
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
index e187779806..456bcf7536 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
@@ -3,13 +3,10 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
-import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * @Description 运营端客户管理服务
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
index 4d6431248b..c7f9f21efb 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
@@ -4,12 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
-import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.feign.OperCrmFeignClient;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description 运营端客户管理服务
  * @Author sun
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
index 3a7120eba2..19f875406f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -5,15 +5,9 @@ import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
 import com.epmet.mq.listener.InitCustomerComponentsListener;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.MessageListener;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 public class RocketMQConsumerRegister extends MQAbstractRegister {
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
index c6c1e0771c..39865e00f6 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
@@ -3,7 +3,6 @@ package com.epmet.service;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ComponentListByCustomerFormDTO;
 import com.epmet.dto.form.CustomerHomeFormDTO;
-import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
 import com.epmet.dto.form.HomeDesignFormDTO;
 import com.epmet.dto.result.ComponentListByCustomerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java
index 1b20573367..56644af135 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java
@@ -1,11 +1,11 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcExportTemplateDTO;
 import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
-import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.dto.result.IcExportTemplateForExportResultDTO;
 import com.epmet.dto.result.TemplateDetailResultDTO;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
index 7423f85289..8dd3193e6d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
@@ -105,8 +105,9 @@ public interface IcFormItemOptionsService extends BaseService<IcFormItemOptionsE
      * 使用item相关条件查询options
      * @param customerId
      * @param formCode
-     * @param label
+     * @param columnName
+     * @param columnNum
      * @return
      */
-    List<IcFormItemOptionsDTO> getOptionsByItemConditions(String customerId, String formCode, String label);
-}
\ No newline at end of file
+    List<IcFormItemOptionsDTO> getOptionsByItemConditions(String customerId, String formCode, String columnName, Integer columnNum);
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java
index f688fea29d..884735c6da 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java
@@ -1,16 +1,13 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 个人分类管理
@@ -45,4 +42,4 @@ public interface IcIndividualCategoryManageService extends BaseService<IcIndivid
      */
     List<IndividualCategoryAllListResultDTO> individualCategoryAllList(TokenDto tokenDto);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java
index c9a4ff28b7..d64741a2ce 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java
@@ -17,17 +17,12 @@
 
 package com.epmet.service;
 
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigSortFormDTO;
 import com.epmet.dto.form.ResiCategoryStatsConfigListFormDTO;
 import com.epmet.dto.result.IcResiCategoryStatsConfigResultDTO;
-import com.epmet.entity.IcResiCategoryStatsConfigEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 居民类别配置表
@@ -46,4 +41,4 @@ public interface ResiCategoryStatsConfigService {
     void updateStatus(String customerId,IcResiCategoryStatsConfigFormDTO formDTO);
 
     void updateSort(String customerId,List<IcResiCategoryStatsConfigSortFormDTO> formDTOs);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 1473a18675..deabec8ea6 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -48,7 +48,6 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import rx.internal.util.LinkedArrayList;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionRoleServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionRoleServiceImpl.java
index f930ee6bdc..d916ee301f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionRoleServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionRoleServiceImpl.java
@@ -20,11 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CustomerFunctionRoleDao;
 import com.epmet.dto.CustomerFunctionRoleDTO;
 import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
@@ -151,4 +150,4 @@ public class CustomerFunctionRoleServiceImpl extends BaseServiceImpl<CustomerFun
         return baseDao.selectCustomerFunctionRoleList(formDTO);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeDetailServiceImpl.java
index b6120822f2..333e83b023 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeDetailServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CustomerHomeDetailDao;
 import com.epmet.dto.CustomerHomeDetailDTO;
 import com.epmet.entity.CustomerHomeDetailEntity;
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 客户首页详情表 
+ * 客户首页详情表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -101,4 +101,4 @@ public class CustomerHomeDetailServiceImpl extends BaseServiceImpl<CustomerHomeD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeServiceImpl.java
index 42721b0474..0ec6ec386d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeServiceImpl.java
@@ -20,11 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.OperCustomizeConstant;
 import com.epmet.dao.CustomerHomeDao;
 import com.epmet.dto.CustomerHomeDTO;
@@ -180,4 +179,4 @@ public class CustomerHomeServiceImpl extends BaseServiceImpl<CustomerHomeDao, Cu
         customerHomeDetailService.insertBatch(list);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java
index b94f5ad8c4..f2d76c7743 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerHomeTemplateServiceImpl.java
@@ -20,12 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.OperCustomizeConstant;
 import com.epmet.constant.ReginConstant;
 import com.epmet.controller.CustomerHomeTemplateFormDTO;
 import com.epmet.dao.CustomerHomeTemplateDao;
@@ -46,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 客户首页模板表 
+ * 客户首页模板表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-10
@@ -198,4 +196,4 @@ public class CustomerHomeTemplateServiceImpl extends BaseServiceImpl<CustomerHom
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java
index 1ab9f564c6..f0dc11413b 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java
@@ -22,11 +22,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerStartPageDao;
@@ -47,7 +47,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -239,4 +242,4 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl<CustomerStartP
         return customer;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedVisitedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedVisitedServiceImpl.java
index 481bb68736..50dc53d881 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedVisitedServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedVisitedServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.FunctionCustomizedVisitedDao;
 import com.epmet.dto.FunctionCustomizedVisitedDTO;
 import com.epmet.dto.form.FunctionVisitedFromDTO;
@@ -115,4 +115,4 @@ public class FunctionCustomizedVisitedServiceImpl extends BaseServiceImpl<Functi
         insert(entity);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java
index 27f835593c..e93f0674a0 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java
@@ -20,10 +20,10 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.FunctionDao;
 import com.epmet.dto.CustomerDTO;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionShoppingHistoryServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionShoppingHistoryServiceImpl.java
index acd0aed260..7e71086b58 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionShoppingHistoryServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionShoppingHistoryServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.FunctionShoppingHistoryDao;
 import com.epmet.dto.FunctionShoppingHistoryDTO;
 import com.epmet.entity.FunctionShoppingHistoryEntity;
@@ -101,4 +101,4 @@ public class FunctionShoppingHistoryServiceImpl extends BaseServiceImpl<Function
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java
index 96ac0834a3..414115ff17 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.HomeComponentDao;
 import com.epmet.dto.HomeComponentDTO;
 import com.epmet.entity.HomeComponentEntity;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
index edac1cfd95..bf6dd8c796 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
@@ -7,7 +7,9 @@ import com.epmet.constant.ReginConstant;
 import com.epmet.dao.CustomerHomeDao;
 import com.epmet.dao.CustomerHomeDetailDao;
 import com.epmet.dao.HomeComponentDao;
-import com.epmet.dto.form.*;
+import com.epmet.dto.form.ComponentListByCustomerFormDTO;
+import com.epmet.dto.form.CustomerHomeFormDTO;
+import com.epmet.dto.form.HomeDesignFormDTO;
 import com.epmet.dto.result.CommonComponentDesignResultDTO;
 import com.epmet.dto.result.ComponentListByCustomerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
index 970845cbee..f176182cf9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
@@ -53,7 +53,7 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOpti
 
     @Autowired
     private IcFormItemDao icFormItemDao;
-    
+
     @Override
     public PageData<IcFormItemOptionsDTO> page(Map<String, Object> params) {
         IPage<IcFormItemOptionsEntity> page = baseDao.selectPage(
@@ -118,19 +118,20 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOpti
     }
 
     @Override
-    public List<IcFormItemOptionsDTO> getOptionsByItemConditions(String customerId, String formCode, String label) {
+    public List<IcFormItemOptionsDTO> getOptionsByItemConditions(String customerId, String formCode, String columnName, Integer columnNum) {
 
         // 查询item
         LambdaQueryWrapper<IcFormItemEntity> formItemQuery = new LambdaQueryWrapper<>();
-        formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId);
-        formItemQuery.eq(IcFormItemEntity::getFormCode, formCode);
-        formItemQuery.eq(IcFormItemEntity::getLabel, label);
+        formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId)
+                .eq(IcFormItemEntity::getFormCode, formCode)
+                .eq(IcFormItemEntity::getColumnName, columnName)
+                .eq(columnNum != null,IcFormItemEntity::getColumnNum,columnNum);
         IcFormItemEntity item = icFormItemDao.selectOne(formItemQuery);
 
         if (item == null) {
             return new ArrayList<>();
         }
-        
+
         // 通过item查询options
         LambdaQueryWrapper<IcFormItemOptionsEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcFormItemOptionsEntity::getItemId, item.getId());
@@ -143,4 +144,4 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOpti
             return oDTO;
         }).collect(Collectors.toList());
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java
index 5eeb6ba23a..1a7df1ec11 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java
@@ -2,18 +2,19 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcIndividualCategoryManageDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
-import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.IcStatsResiResultDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
+import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -25,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 个人分类管理
@@ -119,4 +119,4 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
         }
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryWarnConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryWarnConfigServiceImpl.java
index 9559cf07f0..17e52014bb 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryWarnConfigServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryWarnConfigServiceImpl.java
@@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcResiCategoryWarnConfigDao;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.entity.IcResiCategoryWarnConfigEntity;
@@ -115,4 +115,4 @@ public class IcResiCategoryWarnConfigServiceImpl extends BaseServiceImpl<IcResiC
         return ConvertUtils.sourceToTarget(entityList, IcResiCategoryWarnConfigDTO.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java
index eea56da4e4..fd784501b6 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java
@@ -5,7 +5,6 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java
index 5326d3783d..888019ba05 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.act;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class ActCommentAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java
index fec7eb8808..81e474d25d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.act;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class ActCommentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java
index 08c8a4a729..c219bd217a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.act;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -96,4 +97,4 @@ public class ActOperationRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java
index 65ce8cf5e8..aa3fa51e0e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.act;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class GroupActContentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java
index 81d83e18af..fc4d63705c 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupAchievementStatsDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.group;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class ResiGroupAchievementStatsDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java
index ac301a624c..58f862fd3a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.group;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupOperationDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupOperationDTO.java
index dac5b78dac..fcfffaa0ec 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupOperationDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.group;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java
index 9cad3f3f9a..28c944b474 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.group;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class ResiGroupSetupDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalDTO.java
index 7dad502e68..a516f92c5d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.group;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
index 96295879f1..8063e81df8 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupFormDTO.java
@@ -2,6 +2,7 @@ package com.epmet.resi.group.dto.group.form;
 
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import lombok.Data;
+
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java
index 31a012c22f..477dcf00ef 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java
@@ -1,9 +1,7 @@
 package com.epmet.resi.group.dto.group.form;
 
 import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
index 68e8ceb627..79aa57b533 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.invitation;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java
index 7e68ec4850..9ad6ab2b05 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.member;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java
index a5e795f26f..f975ac189e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.resi.group.dto.member.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java
index 4adcb3082d..b375e3b90a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.resi.group.dto.member.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NegativeOrZero;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java
index 29c1954dea..9e15d17a4c 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.resi.group.dto.member.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupMemberListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupMemberListResultDTO.java
index b6aaf3b8db..e1ed2f1e64 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupMemberListResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupMemberListResultDTO.java
@@ -2,7 +2,6 @@ package com.epmet.resi.group.dto.member.result;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java
index 7101ffb77b..48502f0634 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java
@@ -2,7 +2,6 @@ package com.epmet.resi.group.dto.member.result;
 
 import lombok.Data;
 
-
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java
index 8ad5ed7d44..d4afbe732c 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.notice;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -118,4 +119,4 @@ public class NoticeAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java
index 6e7c7e336f..34e1c0fd4e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.notice;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class NoticeCommentAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java
index fd23f4bef1..2178c0c01f 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.notice;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class NoticeCommentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java
index d45950bd44..211ef00ee3 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.notice;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class NoticeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java
index e3e61cf54b..ed6bf9e941 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.notice;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class NoticeReadRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java
index 551b8eb7d6..f35bfa8961 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.resi.group.dto.notice.result;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
index fc67091945..8a3ea10dde 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class ResiTopicAttachmentDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java
index acd1c4e381..f359e94246 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -123,4 +124,4 @@ public class ResiTopicCommentAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
index 58d4e1bafa..9a364b9c75 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -69,7 +70,7 @@ public class ResiTopicDTO implements Serializable {
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
@@ -138,4 +139,4 @@ public class ResiTopicDTO implements Serializable {
 	 */
 	private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicOperationDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicOperationDTO.java
index 6462f01473..0f3b0d8d30 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicOperationDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class ResiTopicOperationDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java
index 378f03ae8a..5d4d9b1335 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftAttachmentDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -74,7 +75,7 @@ public class TopicDraftAttachmentDTO implements Serializable {
 	private Integer sort;
 
     /**
-     * 附件状态（审核中：auditing； 
+     * 附件状态（审核中：auditing；
         auto_passed: 自动通过；
         review：结果不确定，需要人工审核；
         block: 结果违规；
@@ -121,4 +122,4 @@ public class TopicDraftAttachmentDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
index e2747cdd83..4229986c6a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -59,7 +60,7 @@ public class TopicDraftDTO implements Serializable {
 	private String topicContent;
 
     /**
-     * 话题草稿状态（审核中：auditing； 
+     * 话题草稿状态（审核中：auditing；
         auto_passed: 自动通过；
         review：结果不确定，需要人工审核；
         block: 结果违规；
@@ -84,7 +85,7 @@ public class TopicDraftDTO implements Serializable {
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
@@ -158,4 +159,4 @@ public class TopicDraftDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftOperationDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftOperationDTO.java
index b0629f991a..8f4b407c1b 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftOperationDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftOperationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class TopicDraftOperationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftScanTaskDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftScanTaskDTO.java
index 620f56d7ec..e8c7556f0e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftScanTaskDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftScanTaskDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -101,4 +102,4 @@ block: 结果违规；】
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicShareLinkVisitRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicShareLinkVisitRecordDTO.java
index 572160d9ee..4057fd5f91 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicShareLinkVisitRecordDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicShareLinkVisitRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.topic;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class TopicShareLinkVisitRecordDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -93,4 +94,4 @@ public class TopicShareLinkVisitRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/AllMessagesFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/AllMessagesFormDTO.java
index 335790f7cd..45d3b7da36 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/AllMessagesFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/AllMessagesFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.resi.group.dto.topic.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java
index 70a52582e0..f93f36a041 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.resi.group.dto.topic.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
index de32937a93..01ef83cca1 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.resi.group.dto.topic.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java
index 33a4b24291..3674557e50 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.resi.group.dto.topic.result;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/IssueGridResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/IssueGridResultDTO.java
index 5be2656812..3859b19ad0 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/IssueGridResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/IssueGridResultDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.resi.group.dto.topic.result;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
index 9af69706cd..9fe1b3420f 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.resi.group.dto.topic.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java
index 88a3a0061c..28c270af1d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicFileResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.resi.group.dto.topic.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedList;
 
 /**
  * @Author sun
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index c95abb1044..6f0ae98c44 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -9,9 +9,8 @@ import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
-import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
-import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallbackFactory;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 11d0514d5e..9e228b2dce 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -3,29 +3,16 @@ package com.epmet.resi.group.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.*;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
-import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
-import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
-import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
-import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
-import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
+import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
-import com.epmet.resi.group.dto.topic.result.*;
-import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
-import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
-import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
-import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java
index 95d7d16a99..90701a621e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java
@@ -26,7 +26,10 @@ import com.epmet.resi.group.dto.act.form.CommentFormDTO;
 import com.epmet.resi.group.dto.act.form.CommentQueryFormDTO;
 import com.epmet.resi.group.dto.act.result.CommentResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -40,7 +43,7 @@ import java.util.List;
 @RestController
 @RequestMapping("actcomment")
 public class ActCommentController {
-    
+
     @Autowired
     private ActCommentService actCommentService;
 
@@ -66,11 +69,11 @@ public class ActCommentController {
      * @param formDTO
      * @author yinzuomei
      * @description 006、活动评论列表查询
-     * @Date 2021/4/20 13:01 
+     * @Date 2021/4/20 13:01
      **/
     @PostMapping("comlist")
     public Result<List<CommentResultDTO>> queryCommentList(@RequestBody CommentQueryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, CommentQueryFormDTO.AddUserInternalGroup.class);
         return new Result<List<CommentResultDTO>>().ok(actCommentService.queryCommentList(formDTO));
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
index db9e155e6a..ca36de0c14 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.act.entity.GroupActInfoEntity;
 import com.epmet.resi.group.dto.act.LineChartDTO;
 import com.epmet.resi.group.dto.act.OrganizationalLifeLineChartDTO;
-import com.epmet.resi.group.dto.act.form.OrganizationalLifeFormDTO;
 import com.epmet.resi.group.dto.act.result.OrganizationalLifeResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -95,4 +94,4 @@ public interface GroupActInfoDao extends BaseDao<GroupActInfoEntity> {
      */
     List<LineChartDTO> selectSignInTypeMonth(@Param("userId")String userId,@Param("yearId")String yearId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
index bcb9975bfb..02a8ab2d69 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
@@ -60,7 +60,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index dd0cedc9fa..087b966c2f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -80,7 +80,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
index 337a23454a..d89f188304 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
@@ -10,7 +10,6 @@ import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.modules.feign.GovOrgFeignClient;
-import com.epmet.modules.utils.ModuleConstant;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java
index 242363c794..01d38826f0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java
@@ -7,10 +7,6 @@ import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
 import com.epmet.resi.group.dto.group.result.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
index 6195fbf2e9..e374a32136 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
@@ -36,10 +36,6 @@ import com.epmet.resi.group.dto.member.result.AchievementResultDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
index 3a0b47c336..6b12507ce9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -24,12 +24,12 @@ import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
+import com.epmet.resi.group.dto.member.result.GroupAchievementDTO;
 import com.epmet.resi.group.dto.notice.result.ReadStatusResultDTO;
 import com.epmet.resi.group.dto.notice.result.UnReadListResultDTO;
 import com.epmet.resi.group.dto.topic.result.AllMessagesResultDTO;
 import com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO;
 import com.epmet.resi.group.dto.topic.result.LatestTenResultDTO;
-import com.epmet.resi.group.dto.member.result.GroupAchievementDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java
index 9f8b5c8816..a40c7b2d1f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.group.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java
index 3559786095..9a8cc0fa19 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupAchievementStatsEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.group.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java
index 3859492d3a..6e781e2a13 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java
@@ -18,14 +18,10 @@
 package com.epmet.modules.group.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组二维码 小组唯一二维码，海报码和小组码是同一个二维码，长期有效的
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
index b50f50a417..da522bfcab 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.group.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupOperationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupOperationEntity.java
index 29f255f504..5e102fdb36 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupOperationEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.modules.group.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 群组操作日志表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java
index 77727f9fa3..4eb9e69767 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.group.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 建组设置
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupStatisticalEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupStatisticalEntity.java
index 95ea48a3aa..a8cdd8aa24 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupStatisticalEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupStatisticalEntity.java
@@ -20,13 +20,10 @@ package com.epmet.modules.group.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 群组统计信息表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java
index 5e9aee62ae..c51b400962 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java
@@ -4,10 +4,6 @@ import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
 import com.epmet.resi.group.dto.group.result.*;
 
 import java.util.List;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index 122083cceb..3aaab6e4d4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -30,7 +30,6 @@ import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO;
 import com.epmet.resi.group.dto.member.result.AchievementResultDTO;
-import jdk.nashorn.internal.parser.Token;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
index 827fc40a5f..fa5e644cf3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
@@ -5,7 +5,10 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
 import com.epmet.dto.form.IssueApplicationIdFormDTO;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.ApplicationHistoryResDTO;
+import com.epmet.dto.result.IssueApplicationResDTO;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -18,10 +21,6 @@ import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
 import com.epmet.resi.group.dto.group.result.*;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
-import com.epmet.resi.group.dto.group.result.TopicInfoResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
index 26e984cfad..692a524d51 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
@@ -57,7 +57,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java
index 9fd6f83ba4..1e6a6db42b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.modules.group.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.modules.group.dao.ResiGroupOperationDao;
 import com.epmet.modules.group.entity.ResiGroupOperationEntity;
 import com.epmet.modules.group.redis.ResiGroupOperationRedis;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
index 7d66e78a9a..96c74e0784 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
@@ -19,7 +19,6 @@ package com.epmet.modules.group.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -31,8 +30,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
-import com.epmet.modules.constant.UserMessageConstant;
-import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java
index e88b2ce588..1ea77edfe6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.modules.group.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
@@ -9,7 +10,6 @@ import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.IssueDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity;
 import com.epmet.modules.group.entity.ResiGroupAchievementStatsEntity;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
index 0e20a8b391..136c61a2d7 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
@@ -22,10 +22,10 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.invitation.service.InvitationRecordService;
-import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
-import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
 import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO;
+import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
 import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO;
+import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,7 +42,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("invitationrecord")
 public class InvitationRecordController {
-    
+
     @Autowired
     private InvitationRecordService invitationRecordService;
 
@@ -73,4 +73,4 @@ public class InvitationRecordController {
         return new Result<GetInvitationResultDTO>().ok(invitationRecordService.getInvitation(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
index 7f6fbe80d4..ce0547091f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
@@ -20,7 +20,6 @@ package com.epmet.modules.invitation.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
index 7232c1e3aa..c3d7547d07 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
@@ -30,7 +30,10 @@ import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import com.epmet.resi.group.dto.member.result.JoinGroupApplyRealTimeResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java
index 74fb815cbe..7e7eabc739 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.modules.member.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 组成员出入群记录表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupVisitorEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupVisitorEntity.java
index 0f72355c82..58a7a68578 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupVisitorEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupVisitorEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.member.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
index 32906be649..918587b48c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
@@ -24,9 +24,7 @@ import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.form.JoinGroupByShareLinkFormDTO;
-import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.member.result.JoinGroupApplyRealTimeResultDTO;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 648c64fca0..92e345eff6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -26,15 +26,12 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
-import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.IssueShareLinkRecordDTO;
 import com.epmet.dto.IssueShareLinkVisitRecordDTO;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index f407b50ec3..a933306cb2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -23,16 +23,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.*;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.AchievementTypeEnum;
-import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserMessageTypeConstant;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeAttachmentEntity.java
index 8bce82e2fd..c676c3ca1e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeAttachmentEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.notice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组通知附件表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentEntity.java
index ce1f653f3c..b33bdd547f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeCommentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.notice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组通知评论表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeEntity.java
index 46173d1d3a..5a137530ab 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.notice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java
index a8fd72b35a..eb5f550af8 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.notice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 小组通知组成员阅读记录表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupAchievementUtils.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupAchievementUtils.java
index 2ca6448e93..bc32602fe2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupAchievementUtils.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupAchievementUtils.java
@@ -1,9 +1,9 @@
 package com.epmet.modules.support;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
 
 /**
  * desc:小组成就下一等级规则工具类
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java
index 4d640f5c13..2e743e74a2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java
@@ -11,7 +11,6 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.topic.service.TopicShareLinkRecordService;
-import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
 import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO;
 import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO;
 import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
@@ -36,7 +35,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("topicsharelink")
 public class TopicShareLinkRecordController {
-    
+
     @Autowired
     private TopicShareLinkRecordService topicShareLinkRecordService;
 
@@ -127,4 +126,4 @@ public class TopicShareLinkRecordController {
         return new Result<MemberRelationBetweenGroupAndGridResultDTO>().ok(topicShareLinkRecordService.getStatusByLinkAndInvitee(param));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftDao.java
index 099a93ffe7..dcaaffca90 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftDao.java
@@ -19,18 +19,15 @@ package com.epmet.modules.topic.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.topic.entity.TopicDraftEntity;
-import com.epmet.resi.group.dto.topic.TopicDraftDTO;
-import com.epmet.resi.group.dto.topic.result.DraftDetailResultDTO;
-import com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO;
 import com.epmet.resi.group.dto.topic.form.MyAuditingListFormDTO;
+import com.epmet.resi.group.dto.topic.result.DraftDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyAuditingListResultDTO;
+import com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import java.util.List;
-
 /**
  * 话题草稿内容表
  *
@@ -65,4 +62,4 @@ public interface TopicDraftDao extends BaseDao<TopicDraftEntity> {
      * @Description 个人中心-我发表的话题-审核中列表
      **/
     List<MyAuditingListResultDTO> selectAuditingList(MyAuditingListFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
index bfc91f3abb..9b28b79226 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java
@@ -20,13 +20,10 @@ package com.epmet.modules.topic.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题附件表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
index 738dfd36c9..bf300b092c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
@@ -20,7 +20,6 @@ package com.epmet.modules.topic.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +70,7 @@ public class ResiTopicEntity extends BaseEpmetEntity {
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java
index c99f601bf8..f8ebe239f8 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java
@@ -20,13 +20,10 @@ package com.epmet.modules.topic.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题操作日志表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java
index 343e362ec4..d11f5ecbc6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftAttachmentEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.topic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题草稿附件表
  *
@@ -74,7 +71,7 @@ public class TopicDraftAttachmentEntity extends BaseEpmetEntity {
 	private Integer sort;
 
     /**
-     * 附件状态（审核中：auditing； 
+     * 附件状态（审核中：auditing；
 		auto_passed: 自动通过；
 		review：结果不确定，需要人工审核；
 		block: 结果违规；
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
index d4e87657e3..157fafe0d4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.topic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题草稿内容表
  *
@@ -59,7 +56,7 @@ public class TopicDraftEntity extends BaseEpmetEntity {
 	private String topicContent;
 
     /**
-     * 话题草稿状态（审核中：auditing； 
+     * 话题草稿状态（审核中：auditing；
 		auto_passed: 自动通过；
 		review：结果不确定，需要人工审核；
 		block: 结果违规；
@@ -84,7 +81,7 @@ public class TopicDraftEntity extends BaseEpmetEntity {
 	private String city;
 
     /**
-     * 区 
+     * 区
      */
 	private String area;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftOperationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftOperationEntity.java
index e1092bbaf5..30cebf8d87 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftOperationEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftOperationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.topic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题草稿操作日志表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftScanTaskEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftScanTaskEntity.java
index 9e0cdbbaea..bb149759c3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftScanTaskEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftScanTaskEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.topic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题附件检测任务表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicShareLinkVisitRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicShareLinkVisitRecordEntity.java
index 44edb3624a..039807d548 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicShareLinkVisitRecordEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicShareLinkVisitRecordEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.topic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题分享链接访问记录表
  *
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java
index 6aa26dbe80..dd9af0c879 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java
@@ -29,7 +29,6 @@ import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -135,4 +134,4 @@ public interface ResiTopicCommentService extends BaseService<ResiTopicCommentEnt
      * @author sun
      */
     List<IssueGridResultDTO> topicToIssueList(MyPartProjectsFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicOperationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicOperationService.java
index fedb8579e4..f9637886b3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicOperationService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicOperationService.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.topic.entity.ResiTopicOperationEntity;
 import com.epmet.resi.group.dto.topic.ResiTopicOperationDTO;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -93,4 +92,4 @@ public interface ResiTopicOperationService extends BaseService<ResiTopicOperatio
      * @date 2020-03-31
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
index 9960add54e..c6e8ea45db 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
@@ -21,20 +21,16 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-
 import com.epmet.dto.result.FirstTopicShiftedToIssueApplicationResultDTO;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.modules.topic.entity.ResiTopicEntity;
 import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
-
-
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
 
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java
index b6646cf19c..4866400094 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java
@@ -24,10 +24,8 @@ import com.epmet.modules.topic.entity.TopicDraftEntity;
 import com.epmet.resi.group.dto.topic.TopicDraftDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.DraftDetailResultDTO;
-import com.epmet.resi.group.dto.topic.result.MyAuditingTopicResultDTO;
-import com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO;
-import com.epmet.resi.group.dto.topic.form.MyAuditingListFormDTO;
 import com.epmet.resi.group.dto.topic.result.MyAuditingListResultDTO;
+import com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -162,4 +160,4 @@ public interface TopicDraftService extends BaseService<TopicDraftEntity> {
      * @return void
      */
     void autoAudit();
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkVisitRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkVisitRecordService.java
index d8f2192c41..24279238bb 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkVisitRecordService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkVisitRecordService.java
@@ -5,8 +5,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
 import com.epmet.resi.group.dto.topic.TopicShareLinkVisitRecordDTO;
 import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO;
-import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
-import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -97,4 +95,4 @@ public interface TopicShareLinkVisitRecordService extends BaseService<TopicShare
      * @date 2020.12.22 09:20
     */
     TopicShareLinkVisitRecordEntity getByLinkIdAndInvitee(String linkId,String invitee);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java
index 238682e191..96cce386a5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.modules.topic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.modules.topic.dao.ResiTopicAttachmentDao;
 import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity;
 import com.epmet.modules.topic.service.ResiTopicAttachmentService;
@@ -97,4 +97,4 @@ public class ResiTopicAttachmentServiceImpl extends BaseServiceImpl<ResiTopicAtt
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index 6a90993cb2..9697f16cd8 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -17,14 +17,12 @@
 
 package com.epmet.modules.topic.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -38,7 +36,6 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
-import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
@@ -272,7 +269,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
             if (StringUtils.isNotBlank(commentContent) && commentContent.length() > NumConstant.FIFTEEN){
                 String eventClass = EventEnum.PARTICIPATE_ONE_TOPIC.getEventClass();
                 String eventTag = EventEnum.PARTICIPATE_ONE_TOPIC.getEventTag();
-                
+
                 //mq的事件类型
                 //MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
                 //mqBaseMsgDTO.setEventClass(EventEnum.PARTICIPATE_ONE_TOPIC.getEventClass());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicOperationServiceImpl.java
index 6461f58ee6..1c4a88210b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicOperationServiceImpl.java
@@ -20,10 +20,9 @@ package com.epmet.modules.topic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-
 import com.epmet.modules.topic.dao.ResiTopicOperationDao;
 import com.epmet.modules.topic.entity.ResiTopicOperationEntity;
 import com.epmet.modules.topic.service.ResiTopicOperationService;
@@ -99,4 +98,4 @@ public class ResiTopicOperationServiceImpl extends BaseServiceImpl<ResiTopicOper
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index d11c198e9f..48b68b15d5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -43,7 +43,10 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.OrgInfoConstant;
 import com.epmet.constant.SystemMessageType;
@@ -105,8 +108,8 @@ import com.epmet.resi.group.dto.topic.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.CheckTopicPublisherResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
-import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.send.SendMqMsgUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -420,10 +423,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             //mqBaseMsgDTO.setEventClass(EventEnum.PUBLISH_ONE_TOPIC.getEventClass());
             //事件code
             //mqBaseMsgDTO.setEventTag(EventEnum.PUBLISH_ONE_TOPIC.getEventTag());
-            
+
             String eventClass = TopicConstants.RESI_GROUP;
             String eventTag = SystemMessageType.PUBLISH_ONE_TOPIC;
-            
+
             List<BasePointEventMsg> pointEventMsgList = new ArrayList<>();
             BasePointEventMsg pointEventMsg = new BasePointEventMsg();
             ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(resiTopicPublishFormDTO.getGroupId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
index a614e3db2b..105ad16b37 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
@@ -36,7 +36,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 话题草稿附件表
@@ -118,4 +117,4 @@ public class TopicDraftAttachmentServiceImpl extends BaseServiceImpl<TopicDraftA
         return list;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java
index 9890bf5c79..12bd108da4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java
@@ -20,13 +20,12 @@ package com.epmet.modules.topic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.modules.topic.dao.TopicDraftScanTaskDao;
 import com.epmet.modules.topic.entity.TopicDraftScanTaskEntity;
 import com.epmet.modules.topic.service.TopicDraftScanTaskService;
-import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -125,4 +124,4 @@ public class TopicDraftScanTaskServiceImpl extends BaseServiceImpl<TopicDraftSca
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java
index 85164a7a13..22ff47d1d0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java
@@ -6,23 +6,16 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.feign.GovIssueOpenFeignClient;
-import com.epmet.modules.member.dao.GroupMemeberOperationDao;
-import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.topic.dao.TopicShareLinkVisitRecordDao;
 import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
 import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
 import com.epmet.resi.group.dto.topic.TopicShareLinkVisitRecordDTO;
 import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO;
-import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
-import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;
 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.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
index 3a28c34a95..4cef2e06df 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -4,17 +4,9 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
-import com.epmet.commons.tools.enums.EnvEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 public class RocketMQConsumerRegister extends MQAbstractRegister {
 
@@ -24,4 +16,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
         register(consumerProperties, ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.GROUP_ACHIEVEMENT, "*", new GroupAchievementCustomListener());
         // ...其他监听器类似
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java
index 302ed0a3d5..db842c2ba4 100644
--- a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java
+++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 陌生人访问记录表 
+ * 陌生人访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-19
@@ -113,4 +114,4 @@ public class StrangerAccessRecordDTO implements Serializable {
      */
 	private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
index e3e998fd78..c49955aee8 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
@@ -5,10 +5,10 @@ import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.excel.StrangerAccessRecordExcel;
 import com.epmet.service.StrangerAccessRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
index 709533248a..0a4f75a809 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
@@ -17,14 +17,10 @@
 
 package com.epmet.dao;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.StrangerAccessRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 陌生人访问记录
  *
@@ -33,4 +29,4 @@ import java.util.Map;
  */
 @Mapper
 public interface StrangerAccessRecordDao extends BaseDao<StrangerAccessRecordEntity> {
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
index b9cec3537b..9e9cfafaaa 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
@@ -20,7 +20,6 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,7 +27,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 陌生人访问记录表 
+ * 陌生人访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-16
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index db9e83fe9d..76deff39e7 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -12,7 +12,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-
 import java.util.List;
 
 
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 589f7c944d..6720100e1c 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -10,7 +10,6 @@ import com.epmet.dto.result.PublicCustomerGridForStrangerResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
-
 import java.util.List;
 
 /**
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
index 522cf8c92e..c09a5ff472 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
@@ -1,7 +1,6 @@
 package com.epmet.service.impl;
 
 
-import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
index 1058658f37..a49180aba5 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IssueCustomerParameterDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java
index 89a557de68..b9a05d86f9 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -143,4 +144,4 @@ public class IssueDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
index 7f0cbd1977..3ed20fd470 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class IssueProcessDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
index 60f2ee0e97..22d7cb7966 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class IssueProjectRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
index 04193ca547..a8242f76ab 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class IssueSatisfactionDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
index 3e473491d6..070bc918a5 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class IssueSatisfactionStatisticalDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
index 6347f25532..fd647c80ac 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -78,4 +79,4 @@ public class IssueVoteDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
index 1cee6baee6..3f0a35c6cd 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,4 @@ public class IssueVoteStatisticalDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
index 73292ac02d..34d6654ea6 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class IssueVoteStatisticalDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
index fc800d4d6e..6c7960d26b 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Author zxc
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
index 57fece2b4d..09d9f16635 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import com.epmet.dto.EvaluateInfoDTO;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
index e81a7fbda1..21c334f615 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -2,7 +2,6 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 8cdf3782bb..b284da26f3 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -5,7 +5,6 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
index 77fdcb49dc..a1ef443696 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -3,7 +3,6 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovIssueFeignClient;
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 1e970897f2..2156bddd41 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -9,7 +9,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constat.HallConstat;
 import com.epmet.dto.IssueSuggestionDTO;
-import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.TopicInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
index f7ea5861d3..a211ae59e4 100644
--- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
@@ -4,8 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @Description 我要报事-人大代表列表
  * @author wxz
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java
index 9ee5f79b26..c12d67b6d4 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -1,8 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.annotation.RequirePermission;
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
index 3328277513..a5cd5130f0 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotBlank;
 import java.util.HashMap;
 import java.util.List;
 import java.util.TreeSet;
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
index bc24fd9abb..a2635f71f5 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -5,7 +5,6 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
 import com.epmet.dto.form.LatestIssueListFormDTO;
-import com.epmet.dto.form.LatestListFormDTO;
 import com.epmet.dto.result.LatestIssueListResultDTO;
 import com.epmet.dto.result.LatestListResultDTO;
 import com.epmet.feign.GovIssueFeignClient;
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index 45bfb4e3d9..f8c3435117 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -4,8 +4,8 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.ResiGroupFeignClient;
-import com.epmet.resi.group.dto.group.form.*;
-import com.epmet.resi.group.dto.group.result.*;
+import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO;
+import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java
index acf354f745..c06be807da 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java
@@ -6,7 +6,6 @@ import com.epmet.dto.form.SubmitAdviceFormDTO;
 import com.epmet.dto.result.MyAdviceListResultDTO;
 
 import java.util.List;
-import java.util.Map;
 
 public interface AdviceService {
     Result submitAdvice(SubmitAdviceFormDTO dto);
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
index 318b7f6aa6..e39bd2182c 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
@@ -3,13 +3,15 @@ package com.epmet.modules.grid.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LatestGridInfoFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.modules.grid.service.ResiMineGridService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
index 3778e941c3..78a32b482f 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
@@ -1,7 +1,6 @@
 package com.epmet.modules.grid.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -9,10 +8,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.LatestGridInfoFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
@@ -31,7 +27,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description  居民端用户网格信息service
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java
index f9f133bc02..5b455c43a4 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java
@@ -4,10 +4,10 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.modules.person.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
-import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.resi.mine.dto.from.OperListFormDTO;
 import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
 import com.epmet.resi.mine.dto.result.OperListResultDTO;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java
index 2bd0869cbb..b8e04ded39 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java
@@ -2,9 +2,9 @@ package com.epmet.modules.person.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
-import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.resi.mine.dto.from.OperListFormDTO;
 import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
 import com.epmet.resi.mine.dto.result.OperListResultDTO;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java
index 0bcfd1fb8b..0c1a3239a4 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.dto.form.UserBadgeListFormDTO;
 import com.epmet.dto.form.UserOperListFormDTO;
@@ -12,7 +13,6 @@ import com.epmet.dto.result.UserOperListResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.person.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
-import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.resi.mine.dto.from.OperListFormDTO;
 import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
 import com.epmet.resi.mine.dto.result.OperListResultDTO;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
index 9b1b74a66b..5d7f7b1f2c 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
@@ -9,16 +9,11 @@ import com.epmet.dto.form.ResiInfoSubmitFormDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
-import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.resiregister.service.ResiRegisterService;
-import com.epmet.modules.utils.ModuleConstant;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.regex.Pattern;
-
 /**
  * @Description 居民端居民注册信息service
  * @Author sun
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
index c9e4847fa6..51faeca7c7 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
@@ -1,15 +1,12 @@
 package com.epmet.modules.warmhearted.service.impl;
 
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
-import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleCategoryDictDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleCategoryDictDTO.java
index a93b2ec63b..4d8baffb5f 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleCategoryDictDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleCategoryDictDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -96,4 +97,4 @@ public class IcPartymemberStyleCategoryDictDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleImageDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleImageDTO.java
index 0a39e3dc8e..34fd7dd8ae 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleImageDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleImageDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.resi.partymember.dto.partymember;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 党员风采图片 
+ * 党员风采图片
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
@@ -88,4 +89,4 @@ public class IcPartymemberStyleImageDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
index 57d8800e74..bb3819f800 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.partymember.dto.partymember;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class PartyBranchMembersDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java
index 9c3f0334e6..fb4e5537db 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.resi.partymember.dto.partymember;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class PartymemberAuthRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java
index a86ee343bb..21c21c33c6 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
index 4b9d082184..d64554cf26 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
@@ -2,8 +2,6 @@ package com.epmet.resi.partymember.dto.partymember.result;
 
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @Description 政府端（小程序）党员认证-审核历史列表返参
  * @Author yinzuomei
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
index bef4f48ad2..a5b850cf75 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.resi.partymember.dto.partymember.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 政府端（小程序端）查询待审核列表返参
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
index 24cb26bda8..e3452eb854 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
@@ -20,7 +20,6 @@ package com.epmet.resi.partymember.dto.warmhearted.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -42,4 +41,4 @@ public class ResiWarmheartedResultDTO implements Serializable {
      */
     private String resiWarmVisitId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
index debdc9afea..63c2674043 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
@@ -9,7 +9,6 @@ import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFor
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
-import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
 import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
index f7fe137a60..2cb889e348 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
@@ -11,7 +11,6 @@ import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDeta
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java
index b3cd8ab7aa..8baa1e2766 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java
@@ -5,8 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.AgencyAndStaffsResultDTO;
-import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
index 3098308b28..0c9aa29474 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.AgencyAndStaffsResultDTO;
-import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import org.springframework.stereotype.Component;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
index f73a8bd961..ef2469b7b0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
@@ -17,16 +17,13 @@
 
 package com.epmet.modules.partymember.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.FileUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
@@ -53,12 +50,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URL;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -227,4 +221,4 @@ public class IcPartymemberStyleController {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java
index 9fc1a5c0ff..98a1451059 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partymember.excel.PartyBranchMembersExcel;
 import com.epmet.modules.partymember.service.PartyBranchMembersService;
 import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("partybranchmembers")
 public class PartyBranchMembersController {
-    
+
     @Autowired
     private PartyBranchMembersService partyBranchMembersService;
 
@@ -91,4 +91,4 @@ public class PartyBranchMembersController {
         ExcelUtils.exportExcelToTarget(response, null, list, PartyBranchMembersExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java
index 099d9d434b..9d8c15f891 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java
@@ -6,7 +6,6 @@ import com.epmet.modules.partymember.service.PartyMemberConfirmService;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
-import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
index 5578600dcb..7e778e99cd 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
@@ -20,13 +20,10 @@ package com.epmet.modules.partymember.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党支部党员关系表
  *
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java
index 8639d00ea1..3ab0bdfabf 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.partymember.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberBaseInfoEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberBaseInfoEntity.java
index 8aa8fd0d13..0789053059 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberBaseInfoEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberBaseInfoEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.modules.partymember.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 党员库基本信息表 
+ * 党员库基本信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmAutoEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmAutoEntity.java
index c4aed17def..cdbdc8485e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmAutoEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmAutoEntity.java
@@ -20,7 +20,6 @@ package com.epmet.modules.partymember.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,7 +27,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 党员认证自动审核表 
+ * 党员认证自动审核表
 只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录
  *
  * @author generator generator@elink-cn.com
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java
index 6be68841fb..9f83f67907 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.partymember.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党员认证人工审核表 人工审核时要展示自动审核的结果，同事允许前台去修改党员认证信息表的数据
  *
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberVisitEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberVisitEntity.java
index 9401eb901f..549c75a365 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberVisitEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberVisitEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.partymember.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
index 9e004e03c5..526e939bcb 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
@@ -20,13 +20,11 @@ package com.epmet.modules.partymember.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -131,4 +129,4 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
      * @date 2022/5/9/0009 14:22
      */
     PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java
index e2644fb607..aded302287 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java
@@ -4,7 +4,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
-import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
index 9297c47fbc..f14a765ca6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
@@ -20,9 +20,9 @@ package com.epmet.modules.partymember.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.modules.partymember.dao.PartyBranchMembersDao;
 import com.epmet.modules.partymember.entity.PartyBranchMembersEntity;
 import com.epmet.modules.partymember.redis.PartyBranchMembersRedis;
@@ -101,4 +101,4 @@ public class PartyBranchMembersServiceImpl extends BaseServiceImpl<PartyBranchMe
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
index dfb4c42f71..dc592a254d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
@@ -43,7 +43,6 @@ import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
-import kotlin.jvm.internal.Lambda;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
index 5cb9a012b1..1b79a7d155 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
@@ -18,13 +18,10 @@
 package com.epmet.modules.warmhearted.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
 import org.apache.ibatis.annotations.Mapper;
 
-import javax.management.relation.RelationSupport;
-
 /**
  * 热心居民申请行为记录表
  *
@@ -35,4 +32,4 @@ import javax.management.relation.RelationSupport;
 public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
 
     boolean updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java
index 4df8b1c43c..a6c09608da 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.modules.warmhearted.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 热心居民申请表 
+ * 热心居民申请表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedVisitEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedVisitEntity.java
index b4d66f512d..e3550ea46c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedVisitEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedVisitEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.modules.warmhearted.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
index d58dcc76a3..ab6dcaca93 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
@@ -19,10 +19,8 @@ package com.epmet.modules.warmhearted.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -142,4 +140,4 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/ResiVoiceOpenFeignClient.java b/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/ResiVoiceOpenFeignClient.java
index accd02d67c..9e0ad62fbc 100644
--- a/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/ResiVoiceOpenFeignClient.java
+++ b/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/ResiVoiceOpenFeignClient.java
@@ -1,11 +1,9 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.feign.fallback.ResiVoiceOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.feign.fallback.ResiVoiceOpenFeignClientFallback;
-
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
diff --git a/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/fallback/ResiVoiceOpenFeignClientFallback.java b/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/fallback/ResiVoiceOpenFeignClientFallback.java
index 71a56f62d2..652b1d0ce0 100644
--- a/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/fallback/ResiVoiceOpenFeignClientFallback.java
+++ b/epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/fallback/ResiVoiceOpenFeignClientFallback.java
@@ -1,7 +1,6 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.feign.ResiVoiceOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
index b85fecc7ee..561f7c4cff 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
@@ -31,7 +31,6 @@ import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java b/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java
index 25fb36e167..26da56f351 100644
--- a/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java
+++ b/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java
@@ -1,9 +1,7 @@
 package com.epmet.openapi.sdk.encrypt;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 
 public class Md5Util {
 	/**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java
index 84a00be746..95a4b56fa5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java
@@ -15,4 +15,13 @@ public interface IcResiUserConstant {
 	String USER_TYPE_IC_RESI="icresi";
 	String USER_TYPE_INPUT="input";
 	String USER_TYPE_IMPORT="import";
+
+
+	// origin:变动：change; 迁出：out;    死亡：died; 出生birth; 迁入：in; 新增：add
+	String CHANGE = "change";
+	String OUT = "out";
+	String DIED = "died";
+	String BIRTH = "birth";
+	String IN = "in";
+	String ADD ="add";
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java
index 5eb6e95749..55b50ee4b9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeCertificationConfigDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class BadgeCertificationConfigDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java
index 719675c301..8f0290ac52 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class BadgeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
index 9f77373ab4..879732a1b4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
@@ -1,5 +1,7 @@
 package com.epmet.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -64,6 +66,13 @@ public class ChangeDeathDTO implements Serializable {
      */
     private String type;
 
+    /**
+     * 死亡时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JSONField(format = "yyyy-MM-dd")
+    private Date deathDate;
+
     /**
      * 加入时间
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java
new file mode 100644
index 0000000000..f57b8fb2be
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathExportDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 死亡名单表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-05
+ */
+@Data
+public class ChangeDeathExportDTO {
+
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "性别",replace = { "男_1", "女_0"} )
+    private String gender;
+
+    @Excel(name = "类型",replace = { "房东_1", "租客_0"} )
+    private String type;
+
+    @Excel(name = "加入时间")
+    private String joinDate;
+
+    @Excel(name = "加入原因")
+    private String joinReason;
+
+    @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date createdTime;
+
+
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
index 72914073bb..25b5dbf56b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java
index 94e991c94a..02ce0b34c8 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java
@@ -112,4 +112,8 @@ public class ChangeWelfareDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 是否享受福利，1是 0否 空是
+     */
+    private String isWelfare;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java
index 44845e753f..014f2a9076 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -74,33 +75,33 @@ public class GovStaffRoleDTO implements Serializable {
     private Integer sort;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java
index 98a6176f5f..98ef82f1b4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridLatestDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class GridLatestDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java
index 72eea402f8..78b43c058d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class GridVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
new file mode 100644
index 0000000000..9215512142
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
@@ -0,0 +1,187 @@
+package com.epmet.dto;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+@Data
+public class IcBirthRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 组织的pids
+     */
+	private String pids;
+
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "所属网格不能为空", groups = {AddGroup.class})
+	private String gridId;
+    private String gridName;
+
+    /**
+     * 所属小区ID
+     */
+    @NotBlank(message = "所属小区不能为空", groups = {AddGroup.class})
+	private String villageId;
+
+    /**
+     * 所属楼宇Id
+     */
+    @NotBlank(message = "所属楼宇不能为空", groups = {AddGroup.class})
+	private String buildId;
+
+    /**
+     * 单元id
+     */
+    @NotBlank(message = "所属单元不能为空", groups = {AddGroup.class})
+	private String unitId;
+
+    /**
+     * 所属家庭Id
+     */
+    @NotBlank(message = "所属家庭不能为空", groups = {AddGroup.class})
+	private String homeId;
+    private String home;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = {AddGroup.class})
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class})
+	private String idCard;
+
+    /**
+     * 出生日期
+     */
+	private String birthday;
+
+    /**
+     * 出生地
+     */
+	private String birthplace;
+
+    /**
+     * 是否享受福利【否:0 是:1】
+     */
+	private String isWelfare;
+
+    /**
+     * 父亲姓名
+     */
+	private String father;
+
+    /**
+     * 母亲姓名
+     */
+	private String mother;
+    private String parentName;
+    /**
+     * 胎次
+     */
+	private Integer count;
+
+    /**
+     * 申报日期
+     */
+	private String reportDate;
+
+    /**
+     * 户主姓名
+     */
+	private String householderName;
+
+    /**
+     * 与户主关系【字典表】
+     */
+	private String householderRelation;
+
+    /**
+     * 是否勾选补充居民信息0否 1是
+     */
+	private String isCheck;
+    /**
+     * 是否更新居民信息0否 1是
+     */
+    private String isReplace;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+    @JsonIgnore
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    @JsonIgnore
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+    @JsonIgnore
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonIgnore
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    @JsonIgnore
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonIgnore
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java
index 1f53e4206a..05403600c9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -128,4 +129,4 @@ public class IcEnsureHouseDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java
index 21499eef9a..ef59cb992b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java
@@ -1,16 +1,14 @@
 package com.epmet.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -94,7 +92,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     private String remark;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
@@ -134,4 +132,4 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     @Length(max = 500,message = "通知内容限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private String content;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java
index f68c93d372..f812ba00dd 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcMoveInRecordDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -69,7 +70,12 @@ public class IcMoveInRecordDTO implements Serializable {
     /**
      * 是否享受福利【否:0 是:1】
      */
-	private String isWeifare;
+	private String isWelfare;
+
+    /**
+     * 是否勾选补充居民信息0否 1是
+     */
+	private String isCheck;
 
     /**
      * 手机号
@@ -166,4 +172,4 @@ public class IcMoveInRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java
index eade3aac7b..69654aca84 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -79,4 +80,4 @@ public class IcNatRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java
index 789e5ff1da..60809718eb 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcOldPeopleDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
index a04efa1096..7b9da87c66 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcResiDemandDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java
index 57ea1109e3..89a4f37452 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiVaccineDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -106,4 +107,4 @@ public class IcResiVaccineDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java
index bc9458b2d0..0319ce3e03 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcSpecialDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java
index 006cf7fb67..50c6f6ceaa 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcStatsResiWarnDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -108,4 +109,4 @@ public class IcStatsResiWarnDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
index 85f0e83a89..508f8dc2ad 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadStyle;
 import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java
index 85a3e63feb..bc7109fed4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -148,4 +149,4 @@ public class IcUnemployedDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java
index c6be71bc6c..effcaa8925 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class IcUnitedFrontDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java
index 81c3cd0780..3d0c3271af 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -139,4 +140,4 @@ public class IcUserChangeDetailedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
index 10b926ba35..e7effcd6f7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
@@ -93,7 +93,7 @@ public class IcUserChangeRecordDTO implements Serializable {
     /**
      * 变更时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date changeTime;
 
     /**
@@ -125,7 +125,7 @@ public class IcUserChangeRecordDTO implements Serializable {
      * 创建时间 
      * 调整时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createdTime;
 
     /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java
index 1b6992a53c..00dbb2b770 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -228,4 +229,4 @@ public class IcUserTransferRecordDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
index 73a5d69fe0..585b4ef550 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -116,4 +117,4 @@ public class IcVaccineDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java
index 3dfbaf85cd..7939293b5b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -79,4 +80,4 @@ public class IcVaccineRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java
index 4a49527d42..3bc1ac5e7f 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -113,4 +114,4 @@ public class IcVolunteerDTO implements Serializable {
      */
 	private String field5;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java
index 95fafdccbd..61688b5dbc 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/OperUserDTO.java
@@ -17,12 +17,12 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import lombok.Data;
-
 
 /**
  * 运营人员表
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java
index 68c2e4d895..0cc3ea4019 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class RegisterRelationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java
index 09417f15f4..923e498e5a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -104,4 +105,4 @@ public class ResiUserBadgeDTO implements Serializable {
         this.createdBy = "APP_USER";
         this.updatedBy = "APP_USER";
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java
index a1d1c0adbd..96bb093c81 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RoleDTO.java
@@ -17,13 +17,14 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -83,4 +84,4 @@ public class RoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java
index 45c5c443a8..2cdb9ee5f0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -93,4 +94,4 @@ public class StaffAgencyVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java
index 328aafad2e..74e9afae88 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffGridVisitedDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -83,4 +84,4 @@ public class StaffGridVisitedDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
index 753bc36884..b596bdd919 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class StaffRoleDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,32 +55,32 @@ public class StaffRoleDTO implements Serializable {
 	private String orgId;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
@@ -88,4 +89,4 @@ public class StaffRoleDTO implements Serializable {
      */
     private String customerId;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java
index dfbc170559..8c0ac8b48f 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StatsStaffPatrolRecordDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -153,4 +154,4 @@ public class StatsStaffPatrolRecordDailyDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java
index 6a26e01d39..7e245bec62 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java
index 9fd3d260a8..737a8d621b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserInvitationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -103,4 +104,4 @@ public class UserInvitationDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java
index fc472c660d..a2a24ec20d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiRegisterVisitDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -98,4 +99,4 @@ public class UserResiRegisterVisitDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java
index 1d794e0c30..0af7a4a616 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java
@@ -1,7 +1,5 @@
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java
index ceb07d1651..256d1d51b5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddBadgeFormDTO.java
@@ -5,7 +5,6 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java
index 9e0fd23933..39ca1de27d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.dto.form;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import java.util.Date;
 
 /**
  * @description:
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java
index 484cc4e2d2..92c62dbbfa 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java
new file mode 100644
index 0000000000..e9093a03ee
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java
@@ -0,0 +1,72 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/5/10 10:02
+ */
+@NoArgsConstructor
+@Data
+public class BirthRecordFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5077167613040462646L;
+    /**
+     * 客户ID
+     */
+    private String customerId;
+    private String staffId;
+    /**
+     * 网格ID
+     */
+    private String gridId;
+    /**
+     * 小区ID
+     */
+    private String villageId;
+    /**
+     * 楼栋ID
+     */
+    private String buildId;
+    /**
+     * 单元ID
+     */
+    private String unitId;
+    /**
+     * 房屋ID
+     */
+    private String homeId;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 手机
+     */
+    private String mobile;
+    /**
+     * 身份证
+     */
+    private String idCard;
+    /**
+     * 性别
+     */
+    private String gender;
+    /**
+     * 出生日开始
+     */
+    private String startTime;
+    /**
+     * 出生日期结束
+     */
+    private String endTime;
+    /**
+     * 是否福利
+     */
+    private String isWelfare;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java
new file mode 100644
index 0000000000..5756e76bac
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordUpdateDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/5/11 16:23
+ */
+@NoArgsConstructor
+@Data
+public class BirthRecordUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = -1847965724862077861L;
+    @NotBlank(message = "id不能为空", groups = {UpdateGroup.class})
+    private String id;
+    @NotBlank(message = "出生地不能为空", groups = {UpdateGroup.class})
+    private String birthplace;
+    private String father;
+    private String mother;
+    private Integer count;
+    private String reportDate;
+    private String householderName;
+    private String householderRelation;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java
index 183c59195f..6867827cd4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java
@@ -2,8 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java
index 392e995b86..9137aa9b5a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java
@@ -3,9 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Author zxc
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java
index 27e59a526d..56822cbe2c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java
index 7b8cc1fb4a..ac9e16ed84 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditBadgeFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java
index beb2fae20f..e2212b7608 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnableStaffFormDTO.java
@@ -3,10 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author sun
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java
index 263b263a8f..4ec02f0cf0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetRoleKeyListFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java
new file mode 100644
index 0000000000..bcb62d6b45
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java
@@ -0,0 +1,136 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 迁入管理新增/修改
+ * @Author sun
+ */
+@Data
+public class IcMoveInAddEditFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 迁入Id
+     */
+    @NotBlank(message = "姓名不能为空", groups = {UpdateGroup.class})
+    private String moveInId;
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格ID不能为空", groups = {AddGroup.class})
+    private String gridId;
+    /**
+     * 所属小区ID
+     */
+    @NotBlank(message = "所属小区ID不能为空", groups = {AddGroup.class})
+    private String villageId;
+    /**
+     * 所属楼宇Id
+     */
+    @NotBlank(message = "所属楼宇ID不能为空", groups = {AddGroup.class})
+    private String buildId;
+    /**
+     * 单元id
+     */
+    @NotBlank(message = "单元ID不能为空", groups = {AddGroup.class})
+    private String unitId;
+    /**
+     * 所属家庭Id
+     */
+    @NotBlank(message = "所属家庭ID不能为空", groups = {AddGroup.class})
+    private String homeId;
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = {AddGroup.class})
+    private String name;
+    /**
+     * 是否享受福利【否:0 是:1】
+     */
+    private String isWelfare;
+    /**
+     * 是否勾选补充居民信息0否 1是
+     */
+    private String isCheck;
+    /**
+     * 手机号
+     */
+    @Length(max = 11, message = "手机号位数不能超过11位", groups = AddGroup.class)
+    private String mobile;
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = {AddGroup.class})
+    @Length(min = 15, max = 18, message = "身份证号位数不正确", groups = AddGroup.class)
+    private String idCard;
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+    /**
+     * 年龄
+     */
+    private Integer age;
+    /**
+     * 迁入时间
+     */
+    @NotNull(message = "迁入时间不能为空", groups = {AddGroup.class})
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inTime;
+    /**
+     * 迁入原因
+     */
+    @NotBlank(message = "迁入原因不能为空", groups = {AddGroup.class})
+    private String inReason;
+    /**
+     * 来源地区编码
+     */
+    //@NotBlank(message = "来源地区编码不能为空", groups = {AddGroup.class})
+    private String sourceAddressCode;
+    /**
+     * 来源地区编码全路径
+     */
+    //@NotBlank(message = "来源地区编码全路径不能为空", groups = {AddGroup.class})
+    private String sourceAddressPathCode;
+    /**
+     * 来源地区地址
+     */
+    @NotBlank(message = "来源地区地址不能为空", groups = {AddGroup.class})
+    private String sourceAddress;
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "详细地址不能为空", groups = {AddGroup.class})
+    private String address;
+    /**
+     * 迁移证号码
+     */
+    private String moveNumber;
+    /**
+     * 户主姓名
+     */
+    private String householderName;
+    /**
+     * 与户主关系[字典表]
+     */
+    private String householderRelation;
+    /**
+     * 是否更新【0否  1是】
+     */
+    private String isReplace;
+
+    private String customerId;
+    private String userId;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java
new file mode 100644
index 0000000000..eaeb03b6db
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java
@@ -0,0 +1,75 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 【迁入管理】列表--接口入参
+ * @Author sun
+ */
+@Data
+public class IcMoveInListFormDTO implements Serializable {
+    private static final long serialVersionUID = 9156247659994638103L;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+    /**
+     * 所属小区ID
+     */
+    private String villageId;
+    /**
+     * 所属楼宇Id
+     */
+    private String buildId;
+    /**
+     * 单元id
+     */
+    private String unitId;
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 是否享受福利【否:0 是:1】
+     */
+    private String isWeifare;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 起始迁入时间
+     */
+    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String startTime;
+    /**
+     * 终止迁入时间
+     */
+    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String endTime;
+    /**
+     * 页码
+     */
+    private Integer pageNo = 1;
+    /**
+     * 每页显示数量
+     */
+    private Integer pageSize = 20;
+
+    private Boolean isPage = true;
+    private String customerId;
+    private String moveInId;
+
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java
index 82bcedfa66..b3733abce3 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java
@@ -74,11 +74,21 @@ public class IcResiUserTransferFormDTO implements Serializable {
 	private String customerId;
 	private String staffId;
 
+	// /**
+	//  * out:迁出：这个入参是迁出管理：新增迁入人员内部方法调用
+	//  * died:死亡:这个入参是新增死亡人员内部方法调用
+	//  * birth:出生
+	//  * in：迁入
+	//  */
+	// private String moveType;
+
 	/**
-	 * out:迁出：这个入参是迁出管理：新增迁入人员内部方法调用
-	 * died:死亡:这个入参是新增死亡人员内部方法调用
-	 * birth:出生
-	 * in：迁入
+	 * 变动：change;
+	 * 迁出：out;
+	 * 死亡：died;
+	 * //出生:birth;废弃
+	 * 迁入：in
+	 * 新增：add
 	 */
-	private String moveType;
+	private String origin;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java
index 0179217f1d..6b18910d0a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserWarnNoticeFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import lombok.Data;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java
index 85b56ecb29..3e1ac11b2d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
index da2e899d96..45f9152909 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
@@ -1,12 +1,9 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 @Data
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java
index c79bf3e596..6428ab39e3 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java
@@ -1,24 +1,57 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 
 /**
- * 租客，房东信息
+ * desc:居民信息查询条件
  *
  * @author zhy
  * @date 2022/4/26 10:54
  */
 @Data
-public class RentTenantDataFormDTO implements Serializable {
-    private static final long serialVersionUID = 9156247659994638103L;
+public class RentTenantDataFormDTO extends PageFormDTO {
 
-    @NotBlank(message = "userId不能为空")
+    private static final long serialVersionUID = 803398545727377361L;
+
+    public interface RentTenantDataForm{}
+
+    @NotBlank(message = "userId不能为空", groups = RentTenantDataForm.class)
     private String userId;
 
-    @NotBlank(message = "tokenDto获取customerId不能为空")
+    @NotBlank(message = "tokenDto获取customerId不能为空", groups = RentTenantDataForm.class)
     private String customerId;
 
+    /**
+     * 组织Id
+     */
+    private String agencyId;
+
+    /**
+     * pids
+     */
+    private String pids;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 小区ID
+     */
+    private String neighborHoodId;
+
+    /**
+     * 楼栋ID
+     */
+    private String buildingId;
+
+    /**
+     * 房间ID
+     */
+    private String houseId;
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java
index c675b309dc..db5b074e59 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java
@@ -17,13 +17,11 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.dto.UserResiInfoDTO;
 import lombok.Data;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
index 7aadaf3fcb..75a2eee8e0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java
index 5548431919..0f32479cc0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java
index 7fba162e27..485c4f2e17 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiWarnCountFormDTO.java
@@ -20,9 +20,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 
 /**
@@ -43,4 +41,4 @@ public class StatsResiWarnCountFormDTO implements Serializable {
 	private String userId;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java
index 62dd66c8a0..761eb87eb2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/TagCustomerFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java
index 181fb40e70..fabcd22200 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java
index cfe7f721c8..f9cdd21d90 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBasicInfoFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java
index f0bb36cab8..c36a1a0355 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserInvitationFormDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 记录用户邀请关系入参DTO
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java
index 84578f7abb..7d265b1463 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.form;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
index 23da9d859b..6d365c9955 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.form;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java
index 1cea3c46c4..5a29f8bf69 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
-import lombok.Value;
 
 import javax.validation.constraints.NotBlank;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java
index 832f3c127c..a31cc8587b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java
@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java
index f9be8de0b8..8e0f5ca0bd 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java
index 66b843e924..f994254655 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleListResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 根据客户Id staffId查询人员在客户下的角色列表-接口返参
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java
index 9b80c69701..26e056f24e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java
index 3302c18b97..9bffb84f0a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java
@@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -87,4 +86,4 @@ public class GovStaffRoleResultDTO implements Serializable {
      */
     @JsonIgnore
     private Integer sort;
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
index 6a83a0b552..bbdba74e4b 100755
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -69,33 +70,33 @@ public class GovStaffRoleTemplateDTO implements Serializable {
     private String sort;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 
     /**
-     * 
+     *
      */
 	private Integer revision;
 
     /**
-     * 
+     *
      */
 	private String createdBy;
 
     /**
-     * 
+     *
      */
 	private Date createdTime;
 
     /**
-     * 
+     *
      */
 	private String updatedBy;
 
     /**
-     * 
+     *
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java
new file mode 100644
index 0000000000..4d509f4762
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseIcResiUserResultDTO.java
@@ -0,0 +1,175 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 房屋内居民结果
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class HouseIcResiUserResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+//    /**
+//     * 客户Id customer.id
+//     */
+//    private String customerId;
+//
+//    /**
+//     *
+//     */
+//    private String agencyId;
+//
+//    /**
+//     * 网格ID
+//     */
+//    private String gridId;
+//
+//    /**
+//     * 所属小区ID
+//     */
+//    private String villageId;
+//
+//    /**
+//     * 所属楼宇Id
+//     */
+//    private String buildId;
+//
+//    /**
+//     * 单元id
+//     */
+//    private String unitId;
+
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+
+    /**
+     * 屋内的居民
+     */
+    private List<HouseMemberResultDTO> houseMemberList;
+
+    @Data
+    public static class HouseMemberResultDTO implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 主键
+         */
+        private String id;
+
+        /**
+         * 姓名
+         */
+        private String name;
+
+        /**
+         * 性别
+         */
+        private String gender;
+
+        /**
+         * 手机号
+         */
+        private String mobile;
+
+        /**
+         * 身份证号
+         */
+        private String idCard;
+
+        /**
+         * 出生日期
+         */
+        private String birthday;
+
+        /**
+         * 户籍所在地
+         */
+        private String hjszd;
+
+        /**
+         * 与户主关系【字典表】
+         */
+        private String yhzgx;
+
+        /**
+         * 是否党员
+         */
+        private String isParty;
+
+        /**
+         * 是否租户
+         */
+        private String isTenant;
+
+        /**
+         * 是否流动人口
+         */
+        private String isFloating;
+
+        /**
+         * 工作单位
+         */
+        private String gzdw;
+
+        /**
+         * 民族【字典表】
+         */
+        private String mz;
+
+        /**
+         * 籍贯
+         */
+        private String jg;
+
+        /**
+         * 婚姻状况【字典表】
+         */
+        private String hyzk;
+
+        /**
+         * 文化程度【字典表】
+         */
+        private String culture;
+
+        /**
+         * 宗教信仰
+         */
+        private String faith;
+
+        /**
+         * 备注
+         */
+        private String remarks;
+
+    }
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
new file mode 100644
index 0000000000..9ec9b5956d
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
@@ -0,0 +1,151 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 【迁入管理】列表--接口返参
+ * @Author sun
+ */
+@Data
+public class IcMoveInListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 迁入Id
+     */
+    private String moveInId;
+    /**
+     * 网格ID
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 所属小区ID
+     */
+    private String villageId;
+    /**
+     * 所属小区名称
+     */
+    private String villageName;
+    /**
+     * 所属楼宇Id
+     */
+    private String buildId;
+    /**
+     * 所属楼宇名称
+     */
+    private String buildName;
+    /**
+     * 单元id
+     */
+    private String unitId;
+    /**
+     * 单元名称
+     */
+    private String unitName;
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+    /**
+     * 所属家庭名称
+     */
+    private String homeName;
+    /**
+     * 所属家庭Id
+     */
+    private String allName;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 是否享受福利【否:0 是:1】
+     */
+    private String isWeifare;
+    /**
+     * 是否勾选补充居民信息0否 1是
+     */
+    private String isCheck;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String genderName;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 迁入时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date inTime;
+
+    /**
+     * 迁入原因
+     */
+    private String inReason;
+
+    /**
+     * 来源地区编码
+     */
+    private String sourceAddressCode;
+    /**
+     * 来源地区编码全路径
+     */
+    private String sourceAddressPathCode;
+    /**
+     * 来源地区地址
+     */
+    private String sourceAddress;
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 迁移证号码
+     */
+    private String moveNumber;
+
+    /**
+     * 户主姓名
+     */
+    private String householderName;
+
+    /**
+     * 与户主关系[字典表]
+     */
+    private String householderRelation;
+
+    /**
+     * 与户主关系[字典表]
+     */
+    private String householderRelationName;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java
new file mode 100644
index 0000000000..f54ad0cfe4
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户基础信息
+ * @Author yinzuomei
+ * @Date 2021/11/1 10:34 上午
+ */
+@Data
+public class IcResiUserBaseResultDTO implements Serializable {
+    private static final long serialVersionUID = 5621052927788129250L;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+
+}
+
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
index 9d5f1453d3..056acbc584 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,9 +14,9 @@ import java.util.Map;
 @Data
 public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
     private String houseId;
-    
+
     private String gridId;
-    
+
     private String gridName;
 
     /**
@@ -76,5 +75,5 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
      * 同屋的其他人
      */
     private List<HouseUserDTO> houseUserList;
-    
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java
deleted file mode 100644
index 0c5f5ab0bf..0000000000
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.epmet.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Description TODO
- * @Author yinzuomei
- * @Date 2021/11/1 10:34 上午
- */
-@Data
-public class IcResiUserPageResultDTO implements Serializable {
-    private static final long serialVersionUID = 5621052927788129250L;
-    private String icResiUserId;
-    private String gridId;
-    private String gridName;
-    /**
-     * 所属小区ID
-     */
-    private String villageId;
-    private String vallageName;
-
-
-    /**
-     * 所属楼宇Id
-     */
-    private String buildId;
-    private String buildName;
-
-    /**
-     * 单元id
-     */
-    private String unitId;
-    private String unitName;
-
-    /**
-     * 所属家庭Id
-     */
-    private String homeId;
-    private String homeName;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-
-    /**
-     * 性别
-     */
-    private String gender;
-
-    /**
-     * 身份证号
-     */
-    private String idCard;
-
-    /**
-     * 出生日期
-     */
-    private String birthday;
-
-    /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
-     * 是否党员
-     */
-    private Boolean isParty;
-
-    /**
-     * 是否低保户
-     */
-    private Boolean isDbh;
-
-    /**
-     * 是否保障房
-     */
-    private Boolean isEnsureHouse;
-
-    /**
-     * 是否失业
-     */
-    private Boolean isUnemployed;
-
-    /**
-     * 是否育龄妇女
-     */
-    private Boolean isYlfn;
-
-    /**
-     * 是否退役军人
-     */
-    private Boolean isVeterans;
-
-    /**
-     * 是否统战人员
-     */
-    private Boolean isUnitedFront;
-
-    /**
-     * 是否信访人员
-     */
-    private Boolean isXfry;
-
-    /**
-     * 是否志愿者
-     */
-    private Boolean isVolunteer;
-
-    /**
-     * 是否老年人
-     */
-    private Boolean isOldPeople;
-
-    /**
-     * 是否空巢
-     */
-    private Boolean isKc;
-
-    /**
-     * 是否失独
-     */
-    private Boolean isSd;
-
-    /**
-     * 是否失能
-     */
-    private Boolean isSn;
-
-    /**
-     * 是否失智
-     */
-    private Boolean isSz;
-
-    /**
-     * 是否残疾
-     */
-    private Boolean isCj;
-
-    /**
-     * 是否大病
-     */
-    private Boolean isDb;
-
-    /**
-     * 是否慢病
-     */
-    private Boolean isMb;
-
-    /**
-     * 是否特殊人群
-     */
-    private Boolean isSpecial;
-
-
-    // 以下属性都需要单独处理，不是直接取数据库的字段
-    private String demandCategoryIds;
-
-    private String demandName;
-
-    /**
-     * 房屋类型，1楼房，2平房，3别墅
-     */
-    private String houseType;}
-
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java
index ee1b9e172d..ad9c02ba50 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRecordDetailResultDTO.java
@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java
index c9ebe973db..360f706725 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java
@@ -3,8 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author zhaoqifeng
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java
index c6424eca94..ceb7539914 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java
index 307309f01c..87eaa23625 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StatsdataResultDTO.java
@@ -1,11 +1,9 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 网格员例行工作数据统计
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
index 8c127ed403..af515bf87e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
@@ -2,6 +2,7 @@ package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -10,6 +11,7 @@ import java.io.Serializable;
 /**
  * 迁入管理、出生管理,勾选了补充居民信息，输入身份证号后，调用接口校验是否可继续执行
  */
+@AllArgsConstructor
 @Data
 public class SyncResiResDTO implements Serializable {
     private static final long serialVersionUID = 673439146165836938L;
@@ -50,6 +52,9 @@ public class SyncResiResDTO implements Serializable {
      * 身份证号已存在的居民，返回其房屋id
      */
     private String resiHomeId;
+    /**
+     * 用户状态【0:正常;1:迁出;2:注销】
+     */
     private String status;
     private String icResiUserId;
 
@@ -64,4 +69,7 @@ public class SyncResiResDTO implements Serializable {
         this.status=StrConstant.EPMETY_STR;
         this.icResiUserId=StrConstant.EPMETY_STR;
     }
+    public SyncResiResDTO(){
+
+    }
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java
index 940955725c..0d82016f74 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author zxc
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java
index 3e40404466..0e002dc2a8 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/AttentionTypeEnum.java
@@ -1,7 +1,6 @@
 package com.epmet.enums;
 
 import com.epmet.commons.tools.constant.NumConstant;
-import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 78aa5f8181..f97eb6f53d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -23,7 +23,7 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-// @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
 public interface EpmetUserOpenFeignClient {
 
@@ -740,4 +740,12 @@ public interface EpmetUserOpenFeignClient {
 
     @PostMapping("/epmetuser/icresiuser/userchartlist")
     Result<List<UserChartResultDTO>> userChartList(@RequestBody UserChartFormDTO userDTO);
+
+    /**
+     * desc:条件获取房屋成员信息
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("/epmetuser/icresiuser/getResiUserGroupHomeId")
+    Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index aa0cb1e7f9..1389394e78 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -543,4 +543,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userChartList", userDTO);
     }
 
+    @Override
+    public Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(RentTenantDataFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseMemberList", formDTO);
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java
index ddbcbbb88d..5ace677f91 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java
@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -36,6 +37,7 @@ public class ChangeDeathController {
     private ChangeDeathService changeDeathService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<ChangeDeathDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ChangeDeathDTO> page = changeDeathService.page(params);
         return new Result<PageData<ChangeDeathDTO>>().ok(page);
@@ -73,6 +75,7 @@ public class ChangeDeathController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ChangeDeathDTO> list = changeDeathService.list(params);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
index 99d25eaf03..402cdaa061 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -23,7 +24,7 @@ import java.util.Map;
 
 
 /**
- * 合同表
+ * 人员迁出表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-06
@@ -36,6 +37,7 @@ public class ChangeRelocationController {
     private ChangeRelocationService changeRelocationService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<ChangeRelocationDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ChangeRelocationDTO> page = changeRelocationService.page(params);
         return new Result<PageData<ChangeRelocationDTO>>().ok(page);
@@ -73,6 +75,7 @@ public class ChangeRelocationController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ChangeRelocationDTO> list = changeRelocationService.list(params);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java
index 4b1fee6010..8f95f22f45 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeWelfareController.java
@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -35,6 +36,7 @@ public class ChangeWelfareController {
     private ChangeWelfareService changeWelfareService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<ChangeWelfareDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ChangeWelfareDTO> page = changeWelfareService.page(params);
         return new Result<PageData<ChangeWelfareDTO>>().ok(page);
@@ -71,6 +73,7 @@ public class ChangeWelfareController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ChangeWelfareDTO> list = changeWelfareService.list(params);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
index 01bb8ca3f3..56ac079839 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
@@ -1,7 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
index b1b07c4e9e..af72b5c9cc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.LatestGridInfoFormDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
new file mode 100644
index 0000000000..55e6f4cdc2
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
@@ -0,0 +1,137 @@
+package com.epmet.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcBirthRecordDTO;
+import com.epmet.dto.form.BirthRecordFormDTO;
+import com.epmet.dto.form.BirthRecordUpdateDTO;
+import com.epmet.excel.IcBirthRecordExcel;
+import com.epmet.service.IcBirthRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+@Slf4j
+@RestController
+@RequestMapping("icBirthRecord")
+public class IcBirthRecordController {
+
+    @Autowired
+    private IcBirthRecordService icBirthRecordService;
+
+    @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
+    public Result<PageData<IcBirthRecordDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        PageData<IcBirthRecordDTO> page = icBirthRecordService.page(formDTO);
+        return new Result<PageData<IcBirthRecordDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<IcBirthRecordDTO> get(@PathVariable("id") String id) {
+        IcBirthRecordDTO data = icBirthRecordService.get(id);
+        return new Result<IcBirthRecordDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icBirthRecordService.save(tokenDto, dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordUpdateDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icBirthRecordService.update(tokenDto, dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icBirthRecordService.delete(ids);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("export")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setIsPage(false);
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+
+        ExcelWriter excelWriter = null;
+        AtomicInteger i = new AtomicInteger(1);
+        try {
+            String fileName = "出生管理.xlsx";
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcBirthRecordExcel.class).build();
+            PageData<IcBirthRecordDTO> page = null;
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            do {
+                page = icBirthRecordService.page(formDTO);
+                List<IcBirthRecordExcel> list = ConvertUtils.sourceToTarget(page.getList(), IcBirthRecordExcel.class);
+                list.forEach(item -> {
+                    item.setIndex(i.getAndIncrement());
+                });
+                excelWriter.write(list, writeSheet);
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+            } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize());
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
index bc30dc17ba..4a5be8eb89 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
@@ -1,23 +1,43 @@
 package com.epmet.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcMoveInRecordDTO;
+import com.epmet.dto.form.IcMoveInAddEditFormDTO;
+import com.epmet.dto.form.IcMoveInListFormDTO;
+import com.epmet.dto.result.IcMoveInListResultDTO;
 import com.epmet.excel.IcMoveInRecordExcel;
 import com.epmet.service.IcMoveInRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -28,36 +48,38 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("icMoveIn")
+@Slf4j
 public class IcMoveInRecordController {
 
     @Autowired
     private IcMoveInRecordService icMoveInRecordService;
 
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<IcMoveInRecordDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<IcMoveInRecordDTO> get(@PathVariable("id") String id) {
         IcMoveInRecordDTO data = icMoveInRecordService.get(id);
         return new Result<IcMoveInRecordDTO>().ok(data);
     }
 
     @RequestMapping("list")
-    public Result<PageData<IcMoveInRecordDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcMoveInRecordDTO> page = icMoveInRecordService.page(params);
-        return new Result<PageData<IcMoveInRecordDTO>>().ok(page);
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
+    public Result<PageData<IcMoveInListResultDTO>> list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<PageData<IcMoveInListResultDTO>>().ok(icMoveInRecordService.list(formDTO));
     }
 
     @NoRepeatSubmit
     @PostMapping("add")
-    public Result save(@RequestBody IcMoveInRecordDTO dto){
-        //效验数据
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInAddEditFormDTO dto) {
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setUserId(tokenDto.getUserId());
         icMoveInRecordService.save(dto);
         return new Result();
     }
 
-    @NoRepeatSubmit
     @PostMapping("edit")
-    public Result update(@RequestBody IcMoveInRecordDTO dto){
+    public Result update(@RequestBody IcMoveInAddEditFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         icMoveInRecordService.update(dto);
@@ -65,19 +87,55 @@ public class IcMoveInRecordController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         icMoveInRecordService.delete(ids);
         return new Result();
     }
 
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcMoveInRecordDTO> list = icMoveInRecordService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IcMoveInRecordExcel.class);
+    @NoRepeatSubmit
+    @PostMapping("export")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setIsPage(false);
+        ExcelWriter excelWriter = null;
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        try {
+            String fileName = "迁入管理" + DateUtils.format(new Date()) + ".xlsx";
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            PageData<IcMoveInListResultDTO> data = null;
+            List<IcMoveInRecordExcel> list = null;
+            do {
+                data = icMoveInRecordService.list(formDTO);
+                list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class);
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+                excelWriter.write(list, writeSheet);
+            } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
     }
 
+    @RequestMapping("detail")
+    public Result<IcMoveInListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<IcMoveInListResultDTO>().ok(icMoveInRecordService.detail(formDTO));
+    }
 
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
index 9c96f77ace..543493a395 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
@@ -20,7 +20,10 @@ import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.service.IcResiCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 1f8eb5ed51..30c9a10bc2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -270,7 +270,7 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @PostMapping("rent/getrentresiuserinfo")
     public Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, RentTenantDataFormDTO.RentTenantDataForm.class);
         return new Result<RentTenantDataResultDTO>().ok(icResiUserService.getRentResiUserInfo(formDTO));
     }
 
@@ -473,7 +473,7 @@ public class IcResiUserController implements ResultDataResolver {
         } catch (EpmetException e) {
             response.reset();
             response.setCharacterEncoding("UTF-8");
-            response.setHeader("content-type", "text/htm1; charset=UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
             PrintWriter printWriter = response.getWriter();
             Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
             printWriter.write(JSON.toJSONString(result));
@@ -680,7 +680,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @param formDTO
      * @return
      * @LoginUser TokenDto tokenDto,
-     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
+     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列
      */
     @PostMapping("demandusers")
     public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
@@ -1001,21 +1001,6 @@ public class IcResiUserController implements ResultDataResolver {
         List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
         return new Result().ok(r);
     }
-//    @PostMapping("test-async")
-//    public Result testAsync(HttpServletRequest request) {
-////        tl.set("wxz");
-//        executorService.submit(() -> {
-//            try {
-//                Thread.sleep(500l);
-//                log.info("[我是子线程]:" + EpmetRequestHolder.getHeader("app"));
-//                System.out.println("---");
-//            } catch (InterruptedException e) {
-//                log.error("method exception", e);
-//            }
-//            icResiUserImportService.testAsync();
-//        });
-//        return new Result();
-//    }
 
     /**
      * 根据房屋id,查询居民信息表中-家庭信息-本人  的居民。如果有多个，返回最近一个
@@ -1043,6 +1028,13 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result<SyncResiResDTO>().ok(icResiUserService.checkUser(tokenDto.getCustomerId(), formDto.getIdCard(), formDto.getAgencyId()));
     }
 
-
-
+    /**
+     * desc:条件获取房屋内的居民 按房屋分组
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("getResiUserGroupHomeId")
+    Result<List<HouseIcResiUserResultDTO>> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) {
+        return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO));
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java
index 5b681b639b..45b2d877da 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcStatsResiWarnController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcStatsResiWarnDTO;
 import com.epmet.dto.result.PersonWarnLeftPieResultDTO;
 import com.epmet.excel.IcStatsResiWarnExcel;
@@ -48,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icstatsresiwarn")
 public class IcStatsResiWarnController {
-    
+
     @Autowired
     private IcStatsResiWarnService icStatsResiWarnService;
 
@@ -105,4 +105,4 @@ public class IcStatsResiWarnController {
         return new Result<PersonWarnLeftPieResultDTO>().ok(icStatsResiWarnService.personWarnLeftPie(tokenDto));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java
index b24494d2c9..8e5905b035 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineRelationController.java
@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcVaccineRelationDTO;
 import com.epmet.service.IcVaccineRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java
index a7e8d14592..b304e1428d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java
@@ -7,8 +7,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-
 @RestController
 @RequestMapping("lbtest")
 public class LbTestController {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java
index 65e8b455fa..8f0322f02e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("registerrelation")
 public class RegisterRelationController {
-    
+
     @Autowired
     private RegisterRelationService registerRelationService;
 
@@ -107,4 +107,4 @@ public class RegisterRelationController {
 
         return registerRelationService.getUserInfoAndRoles(enterGridFormDTO);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java
index 98ec4c998f..b21ccdda34 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java
@@ -17,16 +17,14 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.RoleDTO;
 import com.epmet.dto.form.GetRoleKeyListFormDTO;
 import com.epmet.excel.RoleExcel;
@@ -40,7 +38,7 @@ import java.util.Map;
 
 
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -105,4 +103,4 @@ public class RoleController {
         return new Result<List<String>>().ok(roleService.getUserRoleKeyList(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
index 40f45a45ba..ef63dbd8d2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
@@ -21,10 +21,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.StaffBasicInfoFormDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
-import com.epmet.dto.form.WxMsgAuthInfoFormDTO;
 import com.epmet.dto.result.StaffBasicInfo;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
-import com.epmet.dto.result.UserBasicInfo;
 import com.epmet.service.StaffAgencyVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -77,4 +75,4 @@ public class StaffAgencyVisitedController {
 		return new Result<StaffBasicInfo>().ok(staffAgencyVisitedService.getStaffBasicInfo(formDTO));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java
index c79e3439b2..cfcaa166cb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java
@@ -20,9 +20,8 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.StaffGridVisitedFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.service.StaffGridVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,8 +29,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 
 /**
  * 工作人员进入网格日志表
@@ -71,4 +68,4 @@ public class StaffGridVisitedController {
         ValidatorUtils.validateEntity(staffGridVisitedFormDTO);
         return staffGridVisitedService.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
index c9bcc9d905..f45d0b2cf2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
@@ -1,37 +1,24 @@
 package com.epmet.controller;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.patrol.PcworkRecordListFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.excel.StaffPatrolRecordExcel;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
-import com.epmet.util.TestFileUtil;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
 import java.util.List;
 
 /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java
index 06bfa933d2..6a0067a91c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java
@@ -2,10 +2,10 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.result.PatrolYuShanResultDTO;
-import com.epmet.service.StatsStaffPatrolRecordDailyService;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
+import com.epmet.service.StatsStaffPatrolRecordDailyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +21,7 @@ import java.util.List;
 @RestController
 @RequestMapping("statsstaffpatrolrecorddaily")
 public class StatsStaffPatrolRecordDailyController {
-    
+
     @Autowired
     private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService;
 
@@ -47,4 +47,4 @@ public class StatsStaffPatrolRecordDailyController {
     public Result<List<PatrolYuShanResultDTO>> patrolInfo(@RequestParam("agencyId")String agencyId){
         return new Result<List<PatrolYuShanResultDTO>>().ok(statsStaffPatrolRecordDailyService.patrolInfo(agencyId));
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java
index 2be0871e68..21fa2e3606 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceImgController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserAdviceImgDTO;
 import com.epmet.excel.UserAdviceImgExcel;
 import com.epmet.service.UserAdviceImgService;
@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("useradviceimg")
 public class UserAdviceImgController {
-    
+
     @Autowired
     private UserAdviceImgService userAdviceImgService;
 
@@ -91,4 +91,4 @@ public class UserAdviceImgController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserAdviceImgExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java
index fc268ac8dd..0922ed1cce 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java
@@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java
index aea84d1a23..472e74e395 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("userresiregistervisit")
 public class UserResiRegisterVisitController {
-    
+
     @Autowired
     private UserResiRegisterVisitService userResiRegisterVisitService;
 
@@ -97,4 +97,4 @@ public class UserResiRegisterVisitController {
     public Result<ResiRegisterResultDTO> init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){
         return userResiRegisterVisitService.init(resiRegisterFormDTO);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
index ea4c5b010e..99b07f9c36 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
@@ -23,8 +23,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java
index d077a55188..b6cd18f343 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java
@@ -18,17 +18,19 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserHeadPhotoDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.service.UserWechatService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 
 /**
- * 用户微信端关系表 
+ * 用户微信端关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-26
@@ -36,7 +38,7 @@ import java.util.List;
 @RestController
 @RequestMapping("userwechat")
 public class UserWechatController {
-    
+
     @Autowired
     private UserWechatService userWechatService;
 
@@ -45,4 +47,4 @@ public class UserWechatController {
         return new Result<List<CertifiedResultDTO>>().ok(userWechatService.selectUserHeadPhotoByUserId(certifiedResultDTOS));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java
index 51e5020b31..8b5cac02fc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java
@@ -2,10 +2,8 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.form.VolunteerCommonFormDTO;
 import com.epmet.dto.result.VolunteerDistributionResultDTO;
-import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.VolunteerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeDeathDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeDeathDao.java
index 4688321e64..d10aa87484 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeDeathDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeDeathDao.java
@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ChangeDeathDTO;
 import com.epmet.entity.ChangeDeathEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 死亡名单表
  *
@@ -13,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ChangeDeathDao extends BaseDao<ChangeDeathEntity> {
 
+    /**
+     * 死亡名单列表
+     *
+     * @param params
+     * @return java.util.List<com.epmet.dto.ChangeDeathDTO>
+     * @author zhy
+     * @date 2022/5/12 17:44
+     */
+    List<ChangeDeathDTO> getDeathList(Map<String, Object> params);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java
index ee7a543e8e..949f2b9c12 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ChangeRelocationDao.java
@@ -1,11 +1,15 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ChangeRelocationDTO;
 import com.epmet.entity.ChangeRelocationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
- * 合同表
+ * 人员迁出表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-06
@@ -13,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ChangeRelocationDao extends BaseDao<ChangeRelocationEntity> {
 
+    /**
+     * 人员迁出列表
+     *
+     * @param params
+     * @return java.util.List<com.epmet.dto.ChangeRelocationDTO>
+     * @author zhy
+     * @date 2022/5/12 17:45
+     */
+    List<ChangeRelocationDTO> getRelocationList(Map<String, Object> params);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
index 9753829066..bd8d6a633a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.UpGovRoleFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.RoleInfoResultDTO;
 import com.epmet.dto.result.RoleKeyValueResultDTO;
 import com.epmet.dto.result.RoleResultDTO;
 import com.epmet.entity.GovStaffRoleEntity;
@@ -104,4 +103,4 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
      * @Author sun
      **/
     int upNameOrDescription(UpGovRoleFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
index 4efb9ad241..c6a8751eb1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
@@ -18,9 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.GridVisitedDTO;
-import com.epmet.entity.GridLatestEntity;
 import com.epmet.entity.GridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,4 +38,4 @@ public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
     int updateByVisitedId(GridVisitedDTO dto);
     void deleteBatch(@Param("ids") List<String> ids);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java
new file mode 100644
index 0000000000..f3cfc215ee
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java
@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcBirthRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+@Mapper
+public interface IcBirthRecordDao extends BaseDao<IcBirthRecordEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java
index 4910ea8882..e15d2d0b97 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcMoveInRecordDao.java
@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IcMoveInListFormDTO;
+import com.epmet.dto.result.IcMoveInListResultDTO;
 import com.epmet.entity.IcMoveInRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 迁入管理记录
  *
@@ -12,5 +16,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcMoveInRecordDao extends BaseDao<IcMoveInRecordEntity> {
-	
+
+    /**
+     * @Author sun
+     * @Description 【迁入管理】列表查询
+     **/
+    List<IcMoveInListResultDTO> selectMoveInList(IcMoveInListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 6de40fe9fa..b978922d52 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.EpidemicPreventionFormDTO;
+import com.epmet.dto.form.RentTenantDataFormDTO;
 import com.epmet.dto.form.ResiUserQueryValueDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
@@ -159,11 +160,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                          @Param("tableName") String tableName, @Param("userId") String userId);
 
     /**
-     * @Author sun
-     * @Description 查询居民信息
-     **/
-    IcResiUserDTO getResiUser(IcResiUserDTO dto);
-
+     * desc:根据身份证号获取居民信息
+     * @param idCard
+     * @param customerId
+     * @return
+     */
     IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
 
     /**
@@ -301,4 +302,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     IcResiUserEntity selectResiNoDelFlag(@Param("icResiUserId") String icResiUserId);
 
     List<UserChartResultDTO> userChart(@Param("orgId") String orgId, @Param("orgType") String orgType);
+
+    /**
+     * desc:根据维度获取居民信息表的数据
+     * @param formDTO
+     * @return
+     */
+    List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
index 3868760fab..0471d9496b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java
@@ -6,7 +6,6 @@ import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
-import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.entity.IcVaccineEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
index 480c8b52fa..6c6e3aa4fb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
@@ -23,7 +23,6 @@ import com.epmet.entity.RegisterRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-
 import java.util.List;
 
 /**
@@ -64,4 +63,4 @@ public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
      * @date 2021/12/30 3:14 下午
      */
     RegisterRelationDTO resiRelationInfo(@Param("userId")String userId);
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
index c8ceda37c5..4ec14a21a6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
@@ -18,11 +18,9 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.RoleDTO;
 import com.epmet.dto.result.ResiGovRoleResultDTO;
 import com.epmet.entity.RoleEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -48,4 +46,4 @@ public interface RoleDao extends BaseDao<RoleEntity> {
 	 * @Description  获取居民端角色列表
 	 */
 	List<ResiGovRoleResultDTO> selectResiRoleList();
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
index 554da4a12d..fc1f23dcf1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffGridVisitedDao.java
@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.StaffGridVisitedDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -62,4 +61,4 @@ public interface StaffGridVisitedDao extends BaseDao<StaffGridVisitedEntity> {
     **/
     void updateRecordTime(String id, Date date);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
index dea59dfff7..e8a47ab9a1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
@@ -18,8 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.GetRoleKeyListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.PartyMemberUserIdsResultDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java
index 90a6001940..a78c6271be 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeCertificationConfigEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 徽章认证配置
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java
index 351c58e424..5f6d2600bf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeDeathEntity.java
@@ -5,6 +5,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 死亡名单表
  *
@@ -53,6 +55,11 @@ public class ChangeDeathEntity extends BaseEpmetEntity {
      */
 	private String type;
 
+	/**
+	 * 死亡时间
+	 */
+	private Date deathDate;
+
     /**
      * 加入时间
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
index a352125fa3..86bedb482c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java
index 6ac107e80a..785426fe04 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 政府端角色表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
index cd87413736..3ee34582be 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 政府端角色模板表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java
index 254829c16f..7a553346fc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridLatestEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java
index a6cb62c704..31982cd353 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java
new file mode 100644
index 0000000000..116f72e774
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcBirthRecordEntity.java
@@ -0,0 +1,131 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_birth_record")
+public class IcBirthRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 组织的pids
+     */
+	private String pids;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 所属小区ID
+     */
+	private String villageId;
+
+    /**
+     * 所属楼宇Id
+     */
+	private String buildId;
+
+    /**
+     * 单元id
+     */
+	private String unitId;
+
+    /**
+     * 所属家庭Id
+     */
+	private String homeId;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 出生日期
+     */
+	private String birthday;
+
+    /**
+     * 出生地
+     */
+	private String birthplace;
+
+    /**
+     * 是否享受福利【否:0 是:1】
+     */
+	private String isWelfare;
+
+    /**
+     * 父亲姓名
+     */
+	private String father;
+
+    /**
+     * 母亲姓名
+     */
+	private String mother;
+
+    /**
+     * 胎次
+     */
+	private Integer count;
+
+    /**
+     * 申报日期
+     */
+	private String reportDate;
+
+    /**
+     * 户主姓名
+     */
+	private String householderName;
+
+    /**
+     * 与户主关系【字典表】
+     */
+	private String householderRelation;
+
+    /**
+     * 是否勾选补充居民信息0否 1是
+     */
+	private String isCheck;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java
index 52e6ff132f..25a853dd55 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java
@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 疫情特别关注
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java
index 8f976d02b2..810b40d588 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcFollowUpRecordEntity.java
@@ -1,7 +1,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java
index 9ee125a348..0e9f4e76f4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcMoveInRecordEntity.java
@@ -68,7 +68,12 @@ public class IcMoveInRecordEntity extends BaseEpmetEntity {
     /**
      * 是否享受福利【否:0 是:1】
      */
-	private String isWeifare;
+	private String isWelfare;
+
+	/**
+	 * 是否勾选补充居民信息0否 1是
+	 */
+	private String isCheck;
 
     /**
      * 手机号
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java
index ce74babe94..7dd51b4d55 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java
@@ -3,13 +3,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 核酸记录关系表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java
index ba5835c5da..c554ea1257 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 老年人
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
index fa4da89b59..c3f5bac002 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 居民需求
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java
index 4a63f28cf5..114ad7e2e5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 特殊人群
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java
index fd636c095b..8ec7d9aeae 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcStatsResiWarnEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 预警统计表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
index f14eb97013..7182332216 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
@@ -1,7 +1,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java
index 9e00e6527f..181103125e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 失业人员
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java
index 71b0939e67..cd328584ac 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 统战人员
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java
index 9bef5581d7..215fd77173 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java
@@ -3,7 +3,6 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java
index 0c1b6c88ac..d4cfb6ad48 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java
@@ -3,13 +3,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 疫苗接种记录关系表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java
index b5693d7e7f..bcd3340965 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 志愿者
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java
index 1cc5261936..cc4e0fbb5f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/OperUserEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 运营人员表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java
index bf18e08bee..d3361c803d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkTypeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 巡查例行工作
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java
index 100ea4c9ec..ba4ff82087 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 注册关系表 用于统计客户网格的注册居民数
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java
index 4087df8fc6..9906531528 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ResiUserBadgeEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户徽章关系表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java
index 45652df21f..2e86e5a2f2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RoleEntity.java
@@ -18,15 +18,12 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java
index 44c0ab2f51..bfbaf148e5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyVisitedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员进入组织日志表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java
index 9c6ffe281e..e0c1a4a8c2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffGridVisitedEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员进入网格日志表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java
index d90192e218..5334ba2465 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java
index ab52721c9e..d082a56f47 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
index 61e8db0fcd..602d0357b7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 工作人员-角色关系表
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java
index 6a2ee8ab04..e1cffc3be7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
index 9340acd044..2d6352569c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
index 02215059c4..374a63c2b2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
@@ -20,13 +20,10 @@ package com.epmet.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户建议图片
  *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
index 867ae11bdb..a032c42fea 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,7 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 客户Id 
+     * 客户Id
      */
 	private String customerId;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java
index 6307c323ba..e146328d59 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserInvitationEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java
index 0331f222ec..c44fc959d2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiRegisterVisitEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java
index 65bafdd551..3a4e561c77 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java
@@ -1,9 +1,6 @@
 package com.epmet.enums;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.List;
 
 /**
  * @Description 描述
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java
new file mode 100644
index 0000000000..130cde401e
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java
@@ -0,0 +1,78 @@
+package com.epmet.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
+@Data
+public class IcBirthRecordExcel implements Serializable {
+
+    private static final long serialVersionUID = 4539449621014654213L;
+    @ColumnWidth(10)
+    @ExcelProperty(value = "序号",order = 1)
+    private Integer index;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "姓名",order = 1)
+    private String name;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "所属网格",order = 1)
+    private String gridName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "所属房屋",order = 1)
+    private String home;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "手机号",order = 1)
+    private String mobile;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "身份证号",order = 1)
+    private String idCard;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "性别",order = 1)
+    private String gender;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "出生日期",order = 1)
+    private String birthday;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "出生地",order = 1)
+    private String birthplace;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "出生人的父/母姓名",order = 1)
+    private String parentName;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "胎次",order = 1)
+    private Integer count;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "申报户口日期",order = 1)
+    private String reportDate;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "户主姓名",order = 1)
+    private String householderName;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "与户主关系",order = 1)
+    private String householderRelation;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java
index d1ec627c17..4976970ffa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java
@@ -1,8 +1,14 @@
 package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -11,92 +17,73 @@ import java.util.Date;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-09
  */
+@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
 @Data
-public class IcMoveInRecordExcel {
-
-    @Excel(name = "唯一标识")
-    private String id;
-
-    @Excel(name = "客户Id customer.id")
-    private String customerId;
-
-    @Excel(name = "组织Id")
-    private String agencyId;
-
-    @Excel(name = "组织的pids")
-    private String pids;
-
-    @Excel(name = "网格ID")
-    private String gridId;
-
-    @Excel(name = "所属小区ID")
-    private String villageId;
-
-    @Excel(name = "所属楼宇Id")
-    private String buildId;
-
-    @Excel(name = "单元id")
-    private String unitId;
-
-    @Excel(name = "所属家庭Id")
-    private String homeId;
+public class IcMoveInRecordExcel implements Serializable {
 
+    private static final long serialVersionUID = -12110233388005838L;
+    @ExcelProperty(value = "姓名")
     @Excel(name = "姓名")
+    @ColumnWidth(20)
     private String name;
 
-    @Excel(name = "是否享受福利【否:0 是:1】")
-    private String isWeifare;
+    @ExcelProperty(value = "所属网格")
+    @ColumnWidth(20)
+    @Excel(name = "所属网格")
+    private String gridName;
 
-    @Excel(name = "手机号")
+    @ExcelProperty(value = "所属房屋")
+    @ColumnWidth(25)
+    @Excel(name = "所属房屋")
+    private String allName;
+
+    @ExcelProperty(value = "手机号")
+    @ColumnWidth(20)
     private String mobile;
 
+    @ExcelProperty(value = "身份证号")
+    @ColumnWidth(25)
     @Excel(name = "身份证号")
     private String idCard;
 
-    @Excel(name = "性别（1男2女0未知）")
-    private String gender;
+    @ExcelProperty(value = "性别")
+    @Excel(name = "性别")
+    private String genderName;
 
+    @ExcelProperty(value = "年龄")
     @Excel(name = "年龄")
     private Integer age;
 
+    @ExcelProperty(value = "迁入时间")
+    @ColumnWidth(20)
     @Excel(name = "迁入时间")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date inTime;
 
+    @ExcelProperty(value = "迁入原因")
+    @ColumnWidth(25)
     @Excel(name = "迁入原因")
     private String inReason;
 
-    @Excel(name = "来源地")
-    private String source;
-
-    @Excel(name = "详细地址")
-    private String address;
+    @ExcelProperty(value = "由何地迁入")
+    @ColumnWidth(25)
+    @Excel(name = "由何地迁入")
+    private String sourceAddress;
 
+    @ExcelProperty(value = "迁移证号码")
+    @ColumnWidth(20)
     @Excel(name = "迁移证号码")
     private String moveNumber;
 
+    @ExcelProperty(value = "户主姓名")
+    @ColumnWidth(20)
     @Excel(name = "户主姓名")
-    private String houseName;
-
-    @Excel(name = "与户主关系[字典表]")
-    private String houseRelation;
-
-    @Excel(name = "删除标识 0.未删除 1.已删除")
-    private Integer delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
+    private String householderName;
 
-    @Excel(name = "更新时间")
-    private Date updatedTime;
+    @ExcelProperty(value = "与户主关系")
+    @ColumnWidth(20)
+    @Excel(name = "与户主关系")
+    private String householderRelationName;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java
index e553e205e5..316ff22aa7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java
@@ -1,16 +1,12 @@
 package com.epmet.excel;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 /**
  * @Author zxc
  * @DateTime 2022/1/5 10:00 上午
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java
index e12d4549a9..bb10e9c185 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcVaccineExcelImportListener.java
@@ -7,9 +7,7 @@ import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.entity.IcVaccineEntity;
-import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.excel.data.IcVaccineImportExcelData;
-import com.epmet.service.impl.IcNatServiceImpl;
 import com.epmet.service.impl.IcVaccineServiceImpl;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java
index 8f7cb6de14..c05d9661f6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/support/ExportResiUserItemDTO.java
@@ -4,7 +4,9 @@ import com.epmet.dto.result.FormItemResult;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * desc:
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java
index e0be305d7f..005670627a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -9,7 +9,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java
index 39fc8aae8a..c53f3adc60 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java
@@ -6,7 +6,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.OperRoleUserFeignClient;
 import org.springframework.stereotype.Component;
 
-
 import java.util.List;
 
 /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
index 717edcb011..8bfb4ea6d8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
@@ -20,7 +20,6 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.GridVisitedDTO;
 import com.epmet.dto.form.VisitedFormDTO;
 import com.epmet.entity.GridVisitedEntity;
@@ -100,4 +99,4 @@ public interface GridVisitedService extends BaseService<GridVisitedEntity> {
      * @param formDTO
      */
     Result saveVisitedRecord(VisitedFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java
new file mode 100644
index 0000000000..3c4ea335d0
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcBirthRecordService.java
@@ -0,0 +1,68 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.IcBirthRecordDTO;
+import com.epmet.dto.form.BirthRecordFormDTO;
+import com.epmet.dto.form.BirthRecordUpdateDTO;
+import com.epmet.entity.IcBirthRecordEntity;
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+public interface IcBirthRecordService extends BaseService<IcBirthRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param formDTO
+     * @return PageData<IcBirthRecordDTO>
+     * @author generator
+     * @date 2022-05-10
+     */
+    PageData<IcBirthRecordDTO> page(BirthRecordFormDTO formDTO);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcBirthRecordDTO
+     * @author generator
+     * @date 2022-05-10
+     */
+    IcBirthRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-10
+     */
+    void save(TokenDto tokenDto, IcBirthRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-10
+     */
+    void update(TokenDto tokenDto, BirthRecordUpdateDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-05-10
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java
index 3df4e7a2fd..8af41fdc78 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcMoveInRecordService.java
@@ -3,11 +3,11 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcMoveInRecordDTO;
+import com.epmet.dto.form.IcMoveInAddEditFormDTO;
+import com.epmet.dto.form.IcMoveInListFormDTO;
+import com.epmet.dto.result.IcMoveInListResultDTO;
 import com.epmet.entity.IcMoveInRecordEntity;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 迁入管理记录
  *
@@ -16,25 +16,15 @@ import java.util.Map;
  */
 public interface IcMoveInRecordService extends BaseService<IcMoveInRecordEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcMoveInRecordDTO>
-     * @author generator
-     * @date 2022-05-09
-     */
-    PageData<IcMoveInRecordDTO> page(Map<String, Object> params);
-
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<IcMoveInRecordDTO>
      * @author generator
      * @date 2022-05-09
      */
-    List<IcMoveInRecordDTO> list(Map<String, Object> params);
+    PageData<IcMoveInListResultDTO> list(IcMoveInListFormDTO formDTO);
 
     /**
      * 单条查询
@@ -54,7 +44,7 @@ public interface IcMoveInRecordService extends BaseService<IcMoveInRecordEntity>
      * @author generator
      * @date 2022-05-09
      */
-    void save(IcMoveInRecordDTO dto);
+    void save(IcMoveInAddEditFormDTO dto);
 
     /**
      * 默认更新
@@ -64,7 +54,7 @@ public interface IcMoveInRecordService extends BaseService<IcMoveInRecordEntity>
      * @author generator
      * @date 2022-05-09
      */
-    void update(IcMoveInRecordDTO dto);
+    void update(IcMoveInAddEditFormDTO dto);
 
     /**
      * 批量删除
@@ -75,4 +65,6 @@ public interface IcMoveInRecordService extends BaseService<IcMoveInRecordEntity>
      * @date 2022-05-09
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+
+    IcMoveInListResultDTO detail(IcMoveInListFormDTO formDTO);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index 9d16a16f21..b9a9592509 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -328,4 +328,10 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @return
      */
     SyncResiResDTO checkUser(String customerId, String idCard, String agencyId);
+    /**
+     * desc:条件获取居民基础信息
+     * @param formDTO
+     * @return
+     */
+    List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java
index f42238b5cf..ce2747ddcd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java
@@ -19,7 +19,6 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.IcUserChangeDetailedEntity;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -37,4 +36,4 @@ public interface IcUserChangeDetailedService extends BaseService<IcUserChangeDet
      * @Description 删除客户是新增类型的变更明细历史数据
      **/
     void delByCustomerId(String customerId, String type, List<String> icUserIds);
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
index 228e88fb61..4fe9bdfddf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
@@ -35,10 +35,16 @@ public interface IcUserTransferRecordService extends BaseService<IcUserTransferR
      **/
     void add(IcResiUserTransferFormDTO formDTO);
 
+
     /**
-     * 迁出管理：新增迁出人员时，插入调动记录，插入变更主表，明细表
-     * 死亡管理：新增死亡人员时，插入变更主表，明细表
+     * 迁出管理：新增迁出人员时：插入变更主表（操作类型是调动），明细表（原房屋-1）。与原来变动类似，只是选择的迁入至的新房屋类别分析不再+1，
+     * 死亡管理：新增死亡人员时：插入变更主表（操作类型是注销），明细表（原房屋-1）。
+     * 迁入、出生前提：勾选了补充居民信息逻辑如下：
+     * 1、身份证号不存在，相当于新增居民，插入变更记录（类型为操作），无变更明细，因为类别默认都是否；
+     * 2、本社区已存在的居民，状态为正常，修改了房屋的=变动；插入调动记录，变更记录（原房迁出，现房迁入），变更明细；
+     * 3、本社区内的居民，状态迁出（说明原房屋已经-1），这里只需要插入变更记录（in），变更明细（+1）
+     * 4、非本社区内状态为迁出（说明原房屋已经-1），这里插入变更记录（in），变更明细（+1）
      * @param formDTO
      */
-    void moveOutResi(IcResiUserTransferFormDTO formDTO);
+    void moveResi(IcResiUserTransferFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java
index 81653fea19..0023dea98e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java
@@ -27,7 +27,6 @@ import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.github.pagehelper.Page;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 巡查例行工作
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java
index e7989a7de1..05c296d274 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java
@@ -22,8 +22,8 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StaffGridVisitedDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.form.StaffGridVisitedFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 
 import java.util.List;
@@ -114,4 +114,4 @@ public interface StaffGridVisitedService extends BaseService<StaffGridVisitedEnt
      * @Date 2020/4/23 11:20
      **/
     Result saveStaffGridVisitedRecord(StaffGridVisitedFormDTO staffGridVisitedFormDTO);
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsStaffPatrolRecordDailyService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsStaffPatrolRecordDailyService.java
index 9458dcc86f..663826810e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsStaffPatrolRecordDailyService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsStaffPatrolRecordDailyService.java
@@ -1,10 +1,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.dto.result.PatrolYuShanResultDTO;
-import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
+import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 
 import java.util.List;
 
@@ -32,4 +32,4 @@ public interface StatsStaffPatrolRecordDailyService extends BaseService<StatsSta
      */
     List<PatrolYuShanResultDTO> patrolInfo(String agencyId);
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java
index 2af4587368..dcd93d1fa1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeCertificationConfigServiceImpl.java
@@ -20,16 +20,15 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.BadgeCertificationConfigDao;
 import com.epmet.dto.BadgeCertificationConfigDTO;
 import com.epmet.entity.BadgeCertificationConfigEntity;
 import com.epmet.service.BadgeCertificationConfigService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -146,4 +145,4 @@ public class BadgeCertificationConfigServiceImpl extends BaseServiceImpl<BadgeCe
         baseDao.deleteConfig(customerId, badgeId);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
index 7f6ce58c6f..01b850780a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -13,6 +15,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.constant.IcResiUserConstant;
 import com.epmet.dao.ChangeDeathDao;
 import com.epmet.dto.ChangeDeathDTO;
 import com.epmet.dto.ChangeWelfareDTO;
@@ -49,7 +52,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
     private IcResiUserServiceImpl icResiUserServiceImpl;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Autowired
     private ChangeWelfareService changeWelfareService;
@@ -62,11 +65,9 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
 
     @Override
     public PageData<ChangeDeathDTO> page(Map<String, Object> params) {
-        IPage<ChangeDeathEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ChangeDeathDTO.class);
+        IPage<ChangeDeathDTO> page = getPage(params);
+        List<ChangeDeathDTO> list = baseDao.getDeathList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -76,7 +77,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         return ConvertUtils.sourceToTarget(entityList, ChangeDeathDTO.class);
     }
 
-    private QueryWrapper<ChangeDeathEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<ChangeDeathEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String name = (String) params.get("name");
         String idCard = (String) params.get("idCard");
@@ -89,8 +90,8 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
         wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
-        wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
-        wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
+        wrapper.ge(StringUtils.isNotBlank(startTime), "DEATH_DATE", startTime);
+        wrapper.le(StringUtils.isNotBlank(endTime), "DEATH_DATE", endTime);
 
         return wrapper;
     }
@@ -124,7 +125,7 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         insert(entity);
 
-        if(dto.getWelfareFlag() != null && dto.getWelfareFlag()){
+        if (dto.getWelfareFlag() != null && dto.getWelfareFlag()) {
             ChangeWelfareDTO formDto = new ChangeWelfareDTO();
             formDto.setUserId(dto.getUserId());
             formDto.setName(dto.getName());
@@ -140,21 +141,26 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         //更新epmet用户状态
         IcResiUserEntity userEntity = new IcResiUserEntity();
         userEntity.setId(dto.getUserId());
-        userEntity.setStatus("2");//死亡
-        userEntity.setSubStatus("21");//死亡
+        // 用户状态【0:正常;1:迁出;2:注销】
+        userEntity.setStatus(NumConstant.TWO_STR);
+        userEntity.setSubStatus(IcResiUserSubStatusEnum.DIED.getSubStatus());//死亡
         icResiUserService.updateById(userEntity);
+
         //变更主表、变更明细表
-        IcResiUserTransferFormDTO icResiUserTransferFormDTO=new IcResiUserTransferFormDTO();
+        IcResiUserTransferFormDTO icResiUserTransferFormDTO = new IcResiUserTransferFormDTO();
         icResiUserTransferFormDTO.setIcUserId(dto.getUserId());
+        //死亡相当于迁出至客户外，赋值out
         icResiUserTransferFormDTO.setType("out");
-        icResiUserTransferFormDTO.setCustomerId(dto.getCustomerId());
+        icResiUserTransferFormDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         icResiUserTransferFormDTO.setStaffId(dto.getStaffId());
-        //死亡日期即为取当前时间，视作变更时间 todo 待确认
-        icResiUserTransferFormDTO.setTransferTime(new Date());
-        icResiUserTransferFormDTO.setMoveType("died");
+        //死亡日期
+        icResiUserTransferFormDTO.setTransferTime(dto.getDeathDate());
+        //死亡
+        icResiUserTransferFormDTO.setOrigin(IcResiUserConstant.DIED);
         //死亡原因
-        icResiUserTransferFormDTO.setReason(dto.getJoinReason());
-        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveOutResi(icResiUserTransferFormDTO);
+        icResiUserTransferFormDTO.setReason(StringUtils.isNotBlank(dto.getJoinReason()) ? dto.getJoinReason() : "死亡登记");
+        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveResi(icResiUserTransferFormDTO);
+
         //推送MQ事件
         changeRelocationServiceImpl.editResiMq(formDTO.getCustomerId(), dto.getUserId());
         return new Result();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
index 054db973b5..82dc02487e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -15,6 +16,7 @@ import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.ChangeRelocationDao;
 import com.epmet.dto.ChangeRelocationDTO;
@@ -42,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 合同表
+ * 人员迁出表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-06
@@ -55,7 +57,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     private ChangeRelocationRedis changeRelocationRedis;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Autowired
     private IcResiUserServiceImpl icResiUserServiceImpl;
@@ -69,15 +71,11 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     @Autowired
     private IcResiUserService icResiUserService;
 
-
-
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
-        IPage<ChangeRelocationEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ChangeRelocationDTO.class);
+        IPage<ChangeRelocationDTO> page = getPage(params);
+        List<ChangeRelocationDTO> list = baseDao.getRelocationList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -87,8 +85,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         return ConvertUtils.sourceToTarget(entityList, ChangeRelocationDTO.class);
     }
 
-    private QueryWrapper<ChangeRelocationEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<ChangeRelocationEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
         String name = (String) params.get("name");
         String idCard = (String) params.get("idCard");
         String mobile = (String) params.get("mobile");
@@ -104,7 +102,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
 
         QueryWrapper<ChangeRelocationEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
+        wrapper.like(StringUtils.isNotBlank(name), "NAME", name);
         wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
         wrapper.ge(StringUtils.isNotBlank(startTime), "OUT_OF_TIME", startTime);
@@ -147,6 +145,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result saveOutOfInfo(ChangeRelocationDTO dto) {
         RentTenantDataFormDTO formDTO = new RentTenantDataFormDTO();
         formDTO.setUserId(dto.getIcUserId());
@@ -163,45 +162,48 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         entity.setAgencyId(dto.getGridId());
         entity.setAgencyName(dto.getGridName());
         entity.setAge(IdCardNoValidatorUtils.getAge(result.getIdCard()).toString());
-        entity.setAddress(dto.getVillageName()+dto.getBuildName()+dto.getUnitName()+dto.getHomeName());
+        entity.setAddress(dto.getVillageName() + dto.getBuildName() + dto.getUnitName() + dto.getHomeName());
         insert(entity);
 
         //享受福利
-        if(dto.getWelfareFlag() != null && dto.getWelfareFlag()){
+        if (dto.getWelfareFlag() != null && dto.getWelfareFlag()) {
             ChangeWelfareDTO formDto = new ChangeWelfareDTO();
             formDto.setUserId(dto.getIcUserId());
             formDto.setName(dto.getName());
             formDto.setIdCard(result.getIdCard());
             formDto.setMobile(result.getMobile());
             formDto.setGridId(result.getGridId());
-            if(StringUtils.isNotBlank(dto.getGender())){
-                if("女".equals(dto.getGender())){
+            if (StringUtils.isNotBlank(dto.getGender())) {
+                if ("女".equals(dto.getGender())) {
                     formDto.setGender("0");
-                }else if("男".equals(dto.getGender())){
+                } else if ("男".equals(dto.getGender())) {
                     formDto.setGender("1");
+                } else {
+                    formDto.setGender("2");
                 }
             }
             formDto.setJoinReason("迁出人员选定");
-            formDto.setCustomerId(dto.getCustomerId());
             formDto.setCustomerId(formDTO.getCustomerId());
             changeWelfareService.saveWelfareInfo(formDto);
         }
         //更新epmet用户状态
         IcResiUserEntity userEntity = new IcResiUserEntity();
         userEntity.setId(dto.getIcUserId());
-        userEntity.setStatus("1");//转出（迁出）
+        userEntity.setStatus(NumConstant.ONE_STR);//转出（迁出）
         userEntity.setSubStatus(IcResiUserSubStatusEnum.MOVE_OUT.getSubStatus());//迁出
         icResiUserService.updateById(userEntity);
-        //插入一条调动（迁出）记录、变更主表、变更明细表
-        IcResiUserTransferFormDTO icResiUserTransferFormDTO=ConvertUtils.sourceToTarget(dto,IcResiUserTransferFormDTO.class);
+        //插入变更主表、变更明细表
+        IcResiUserTransferFormDTO icResiUserTransferFormDTO = ConvertUtils.sourceToTarget(dto, IcResiUserTransferFormDTO.class);
         icResiUserTransferFormDTO.setNewAgencyId(dto.getAgencyId());
         icResiUserTransferFormDTO.setNewGridId(dto.getGridId());
         icResiUserTransferFormDTO.setNewNeighborHoodId(dto.getVillageId());
         icResiUserTransferFormDTO.setNewBuildingId(dto.getBuildId());
         icResiUserTransferFormDTO.setNewBuildingUnitId(dto.getUnitId());
         icResiUserTransferFormDTO.setNewHouseId(dto.getHomeId());
-        icResiUserTransferFormDTO.setMoveType("out");
-        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveOutResi(icResiUserTransferFormDTO);
+        //迁出
+        icResiUserTransferFormDTO.setOrigin(IcResiUserConstant.OUT);
+        icResiUserTransferFormDTO.setReason(StringUtils.isNotBlank(dto.getReason()) ? dto.getReason() : "迁出登记");
+        SpringContextUtils.getBean(IcUserTransferRecordService.class).moveResi(icResiUserTransferFormDTO);
         //推送MQ事件
         editResiMq(dto.getCustomerId(), dto.getIcUserId());
         return new Result();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
index 301091af1f..1342549b3e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -40,7 +41,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
     private ChangeWelfareRedis changeWelfareRedis;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Autowired
     private IcResiUserServiceImpl icResiUserServiceImpl;
@@ -61,7 +62,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
         return ConvertUtils.sourceToTarget(entityList, ChangeWelfareDTO.class);
     }
 
-    private QueryWrapper<ChangeWelfareEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<ChangeWelfareEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String name = (String) params.get("name");
         String idCard = (String) params.get("idCard");
@@ -128,7 +129,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
 
     @Override
     public Result removeWelfare(ChangeWelfareDTO dto) {
-        if(StringUtils.isBlank(dto.getId())){
+        if (StringUtils.isBlank(dto.getId())) {
             return new Result().error("id不可为空");
         }
         dto.setRemoveDate(DateUtils.format(new Date()));
@@ -139,11 +140,16 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
     @Override
     public Boolean checkWelfareByIdCard(CheckWelfareByIdCardDTO dto) {
         ChangeWelfareEntity entity = baseDao.selectByIdCard(dto.getIdCard());
-        return entity == null? false: true;
+        return entity != null;
     }
 
     @Override
     public Result saveWelfareInfo(ChangeWelfareDTO dto) {
+        dto.setId(StringUtils.EMPTY);
+        if (NumConstant.ZERO_STR.equals(dto.getIsWelfare())) {
+            removeWelfare(dto);
+            return new Result();
+        }
         Map<String, Object> params = new HashMap<>(4);
         params.put("idCard", dto.getIdCard());
         if (!list(params).isEmpty()) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
new file mode 100644
index 0000000000..afb5f9bfd4
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
@@ -0,0 +1,285 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.GenderEnum;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
+import com.epmet.commons.tools.enums.RelationshipEnum;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.IcBirthRecordDao;
+import com.epmet.dao.IcResiUserDao;
+import com.epmet.dto.ChangeWelfareDTO;
+import com.epmet.dto.IcBirthRecordDTO;
+import com.epmet.dto.form.BirthRecordFormDTO;
+import com.epmet.dto.form.BirthRecordUpdateDTO;
+import com.epmet.dto.form.IcResiUserTransferFormDTO;
+import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.SyncResiResDTO;
+import com.epmet.entity.IcBirthRecordEntity;
+import com.epmet.entity.IcResiUserEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.ChangeWelfareService;
+import com.epmet.service.IcBirthRecordService;
+import com.epmet.service.IcResiUserService;
+import com.epmet.service.IcUserTransferRecordService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 出生管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-10
+ */
+@Service
+public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao, IcBirthRecordEntity> implements IcBirthRecordService {
+    @Resource
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Resource
+    private IcResiUserService icResiUserService;
+    @Resource
+    private IcUserTransferRecordService icUserTransferRecordService;
+    @Resource
+    private IcResiUserDao icResiUserDao;
+    @Resource
+    private ChangeWelfareService changeWelfareService;
+
+    @Override
+    public PageData<IcBirthRecordDTO> page(BirthRecordFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo) {
+            throw new EpmetException("获取工作人员信息失败");
+        }
+
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        LambdaQueryWrapper<IcBirthRecordEntity> wrapper = getWrapper(formDTO, staffInfo);
+        List<IcBirthRecordEntity> entityList = baseDao.selectList(wrapper);
+        PageInfo<IcBirthRecordEntity> pageInfo = new PageInfo<>(entityList);
+        List<IcBirthRecordDTO> list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class);
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            //查询网格名称
+            List<String> gridIds = list.stream().map(IcBirthRecordDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            Result<List<AllGridsByUserIdResultDTO>> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
+            List<AllGridsByUserIdResultDTO> gridInfoList = gridInfoRes.success() && !CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>();
+            Map<String, String> gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName, (key1, key2) -> key2));
+
+            //查询房子名称
+            List<String> houseIdList = list.stream().map(IcBirthRecordDTO::getHomeId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            Set<String> houseIds = new HashSet<>(houseIdList);
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+            List<HouseInfoDTO> houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
+            Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
+            list.forEach(item -> {
+                item.setGridName(gridInfoMap.get(item.getGridId()));
+                if (houseInfoMap.containsKey(item.getHomeId()) && null != houseInfoMap.get(item.getHomeId())) {
+                    HouseInfoDTO houseInfoDTO = houseInfoMap.get(item.getHomeId());
+                    item.setHome(houseInfoDTO.getAllName());
+                }
+                if (StringUtils.isNotBlank(item.getFather()) && StringUtils.isNotBlank(item.getMother())) {
+                    item.setParentName(item.getFather().concat(StrConstant.SEPARATOR).concat(item.getMother()));
+                } else {
+                    String parentName = StringUtils.isBlank(item.getFather())?"":item.getFather() ;
+                    parentName = parentName.concat(StringUtils.isBlank(item.getMother())?"":item.getMother());
+                    item.setParentName(parentName);
+                }
+                if (StringUtils.isNotBlank(item.getHouseholderRelation())) {
+                    item.setHouseholderRelation(RelationshipEnum.getEnum(item.getHouseholderRelation()).getName());
+                }
+                item.setGender(GenderEnum.getName(item.getGender()));
+            });
+        }
+
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    @Override
+    public IcBirthRecordDTO get(String id) {
+        IcBirthRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcBirthRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(TokenDto tokenDto,  IcBirthRecordDTO dto) {
+        //获取工作人员信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo) {
+            throw new EpmetException("获取工作人员信息失败");
+        }
+        //
+        SyncResiResDTO sync = icResiUserService.checkUser(tokenDto.getCustomerId(), dto.getIdCard(), staffInfo.getAgencyId());
+        //是否补充居民信息
+        if (NumConstant.ONE_STR.equals(dto.getIsCheck())) {
+            //判断是否可迁入
+            if (!sync.getMoveInstatus()) {
+                throw new EpmetException("请联系" + sync.getResiAgencyName() + "迁出该居民后操作");
+            }
+
+            IcResiUserEntity userEntity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);;
+
+            userEntity.setCustomerId(tokenDto.getCustomerId());
+            userEntity.setAgencyId(staffInfo.getAgencyId());
+            userEntity.setPids(staffInfo.getAgencyPIds());
+            userEntity.setYhzgx(dto.getHouseholderRelation());
+            userEntity.setStatus(NumConstant.ZERO_STR);
+            userEntity.setSubStatus(IcResiUserSubStatusEnum.BIRTH.getSubStatus());
+
+            //判断是否有所属组织，如果有，判断是否属于当前组织，没有的话则直接新增
+            if (StringUtils.isNotEmpty(sync.getIcResiUserId())) {
+                userEntity.setId(sync.getIcResiUserId());
+                if (staffInfo.getAgencyId().equals(sync.getResiAgencyId())) {
+                    //组织相等的情况
+                    if (NumConstant.ZERO_STR.equals(sync.getStatus())) {
+                        //正常状态
+                        if (!dto.getHomeId().equals(sync.getResiHomeId())) {
+                            //房屋信息不一致
+                            //是否更新 为空，返回确认消息
+                            if (StringUtils.isBlank(dto.getIsReplace())) {
+                                throw new EpmetException("居民信息中房屋信息与当前选择房屋不一致，是否更新？");
+                            } else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) {
+                                extracted(tokenDto, dto, staffInfo, sync, "change");
+                                //更新居民信息
+                                icResiUserDao.updateById(userEntity);
+                            }
+                        } else {
+                            //房屋信息一致
+                            //更新居民信息
+                            icResiUserDao.updateById(userEntity);
+                        }
+                    } else {
+                        //迁出或注销状态，
+                        //迁入记录
+                        extracted(tokenDto, dto, staffInfo, sync, "in");
+                        //更新居民信息
+                        icResiUserDao.updateById(userEntity);
+                    }
+                } else {
+                    //组织不相等的情况
+                    //迁入记录
+                    extracted(tokenDto, dto, staffInfo, sync, "in");
+                    //更新居民信息
+                    icResiUserDao.updateById(userEntity);
+                }
+            } else {
+                //添加居民信息
+                icResiUserDao.insert(userEntity);
+                //迁入记录
+                sync.setIcResiUserId(userEntity.getId());
+                extracted(tokenDto, dto, staffInfo, sync, "add");
+            }
+        }
+
+        //生成出生记录
+        IcBirthRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcBirthRecordEntity.class);
+        entity.setCustomerId(tokenDto.getCustomerId());
+        entity.setAgencyId(staffInfo.getAgencyId());
+        entity.setPids(staffInfo.getAgencyPIds());
+        insert(entity);
+
+        //记录享受福利信息
+        if (NumConstant.ONE_STR.equals(dto.getIsWelfare())) {
+            ChangeWelfareDTO welfare = new ChangeWelfareDTO();
+            welfare.setCustomerId(tokenDto.getCustomerId());
+            welfare.setGridId(dto.getGridId());
+            welfare.setUserId(sync.getIcResiUserId());
+            welfare.setIdCard(dto.getIdCard());
+            welfare.setMobile(dto.getMobile());
+            welfare.setName(dto.getName());
+            welfare.setGender(dto.getGender());
+            welfare.setJoinReason("出生登记选定");
+            changeWelfareService.saveWelfareInfo(welfare);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(TokenDto tokenDto, BirthRecordUpdateDTO dto) {
+
+        //获取工作人员信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo) {
+            throw new EpmetException("获取工作人员信息失败");
+        }
+
+        IcBirthRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcBirthRecordEntity.class);
+        updateById(entity);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @NotNull
+    private LambdaQueryWrapper<IcBirthRecordEntity> getWrapper(BirthRecordFormDTO formDTO, CustomerStaffInfoCacheResult staffInfo) {
+        LambdaQueryWrapper<IcBirthRecordEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcBirthRecordEntity::getCustomerId, formDTO.getCustomerId());
+        wrapper.and(wq -> wq.eq(IcBirthRecordEntity::getAgencyId, staffInfo.getAgencyId()).or().like(IcBirthRecordEntity::getPids, staffInfo.getAgencyId()));
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcBirthRecordEntity::getGridId, formDTO.getGridId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getVillageId()), IcBirthRecordEntity::getVillageId, formDTO.getVillageId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildId()), IcBirthRecordEntity::getBuildId, formDTO.getBuildId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcBirthRecordEntity::getUnitId, formDTO.getUnitId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getHomeId()), IcBirthRecordEntity::getHomeId, formDTO.getHomeId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getGender()), IcBirthRecordEntity::getGender, formDTO.getGender());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getIsWelfare()), IcBirthRecordEntity::getIsWelfare, formDTO.getIsWelfare());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcBirthRecordEntity::getName, formDTO.getName());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getMobile()), IcBirthRecordEntity::getMobile, formDTO.getMobile());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getIdCard()), IcBirthRecordEntity::getIdCard, formDTO.getIdCard());
+        wrapper.ge(StringUtils.isNotBlank(formDTO.getStartTime()), IcBirthRecordEntity::getBirthday, formDTO.getStartTime());
+        wrapper.le(StringUtils.isNotBlank(formDTO.getEndTime()), IcBirthRecordEntity::getBirthday, formDTO.getEndTime());
+        wrapper.orderByDesc(IcBirthRecordEntity::getCreatedTime);
+        return wrapper;
+    }
+
+    /**
+     * 迁入记录
+     * @Param tokenDto
+     * @Param dto
+     * @Param staffInfo
+     * @Param sync
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/5/11 9:15
+     */
+    private void extracted(TokenDto tokenDto, IcBirthRecordDTO dto, CustomerStaffInfoCacheResult staffInfo, SyncResiResDTO sync, String origin) {
+        IcResiUserTransferFormDTO transfer = new IcResiUserTransferFormDTO();
+        transfer.setCustomerId(tokenDto.getCustomerId());
+        transfer.setStaffId(tokenDto.getUserId());
+        transfer.setIcUserId(sync.getIcResiUserId());
+        transfer.setType("in");
+        transfer.setNewAgencyId(staffInfo.getAgencyId());
+        transfer.setNewGridId(dto.getGridId());
+        transfer.setNewNeighborHoodId(dto.getVillageId());
+        transfer.setNewBuildingId(dto.getBuildId());
+        transfer.setNewBuildingUnitId(dto.getUnitId());
+        transfer.setNewHouseId(dto.getHomeId());
+        transfer.setTransferTime(new Date());
+        transfer.setReason("出生登记");
+        transfer.setOrigin(origin);
+        icUserTransferRecordService.moveResi(transfer);
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
index c2501bfed0..ecb0cfc044 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
@@ -1,22 +1,49 @@
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.DictTypeEnum;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcMoveInRecordDao;
+import com.epmet.dto.ChangeWelfareDTO;
 import com.epmet.dto.IcMoveInRecordDTO;
+import com.epmet.dto.form.IcMoveInAddEditFormDTO;
+import com.epmet.dto.form.IcMoveInListFormDTO;
+import com.epmet.dto.form.IcResiUserTransferFormDTO;
+import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.IcMoveInListResultDTO;
+import com.epmet.dto.result.SyncResiResDTO;
 import com.epmet.entity.IcMoveInRecordEntity;
+import com.epmet.entity.IcResiUserEntity;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.ChangeWelfareService;
 import com.epmet.service.IcMoveInRecordService;
+import com.epmet.service.IcResiUserService;
+import com.epmet.service.IcUserTransferRecordService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
 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 org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 迁入管理记录
@@ -25,32 +52,62 @@ import java.util.Map;
  * @since v1.0.0 2022-05-09
  */
 @Service
+@Slf4j
 public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao, IcMoveInRecordEntity> implements IcMoveInRecordService {
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private IcResiUserService icResiUserService;
+    @Autowired
+    private IcUserTransferRecordService icUserTransferRecordService;
+    @Autowired
+    private EpmetAdminOpenFeignClient adminOpenFeignClient;
+    @Autowired
+    private ChangeWelfareService changeWelfareService;
 
 
     @Override
-    public PageData<IcMoveInRecordDTO> page(Map<String, Object> params) {
-        IPage<IcMoveInRecordEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcMoveInRecordDTO.class);
-    }
-
-    @Override
-    public List<IcMoveInRecordDTO> list(Map<String, Object> params) {
-        List<IcMoveInRecordEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcMoveInRecordDTO.class);
-    }
+    public PageData<IcMoveInListResultDTO> list(IcMoveInListFormDTO formDTO) {
+        //列表/导出查询
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        List<IcMoveInListResultDTO> list = baseDao.selectMoveInList(formDTO);
+        PageInfo<IcMoveInListResultDTO> pageInfo = new PageInfo<>(list);
 
-    private QueryWrapper<IcMoveInRecordEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        //查询封装房屋信息
+        if (!CollectionUtils.isEmpty(list)) {
+            //查询网格名称(组织-网格)
+            List<String> gridIds = list.stream().map(IcMoveInListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            Result<List<AllGridsByUserIdResultDTO>> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
+            List<AllGridsByUserIdResultDTO> gridInfoList = gridInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>();
+            Map<String, String> gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName, (key1, key2) -> key2));
+            //查询房屋信息
+            Set<String> houseIds = list.stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet());
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+            List<HouseInfoDTO> houseInfoDTOList = houseInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
+            Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
+            //与户主关系字典表数据
+            Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
+            Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
 
-        QueryWrapper<IcMoveInRecordEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+            //封装数据
+            for (IcMoveInListResultDTO v : list) {
+                if (gridInfoMap.containsKey(v.getGridId())) {
+                    v.setGridName(gridInfoMap.get(v.getGridId()));
+                }
+                if (houseInfoMap.containsKey(v.getHomeId())) {
+                    v.setVillageName(houseInfoMap.get(v.getHomeId()).getNeighborHoodName());
+                    v.setBuildName(houseInfoMap.get(v.getHomeId()).getBuildingName());
+                    v.setUnitName(houseInfoMap.get(v.getHomeId()).getUnitName());
+                    v.setHomeName(houseInfoMap.get(v.getHomeId()).getDoorName());
+                    v.setAllName(houseInfoMap.get(v.getHomeId()).getAllName());
+                }
+                if (StringUtils.isNotBlank(v.getHouseholderRelation())) {
+                    v.setHouseholderRelationName(statusMap.get(v.getHouseholderRelation()));
+                }
+            }
+        }
 
-        return wrapper;
+        return new PageData<>(list, pageInfo.getTotal());
     }
 
     @Override
@@ -59,17 +116,127 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         return ConvertUtils.sourceToTarget(entity, IcMoveInRecordDTO.class);
     }
 
+    /**
+     * @Author sun
+     * @Description 【迁入管理】新增迁入记录
+     * 1.判断是否本社区居民，是的在判断是正常还是游离，正常的判断房屋跟之前是否一样，不一样的给提示是否更新，一样的直接更新居民信息，生成迁入记录，
+     * 游离的直接更新居民信息，生成迁入记录；
+     * 2.判断不是本社区居民的，在判断是正常还是游离，正常的直接停止程序操作，游离的直接更新居民信息，生成迁入记录；
+     * 3.不是本社区居民的在客户下不存在的直接新增居民新增迁入记录
+     **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(IcMoveInRecordDTO dto) {
-        IcMoveInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcMoveInRecordEntity.class);
+    public void save(IcMoveInAddEditFormDTO formDTO) {
+        //1.获取当前工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId()));
+        }
+
+        //2.校验是否允许迁入
+        SyncResiResDTO resiDTO = icResiUserService.checkUser(formDTO.getCustomerId(), formDTO.getIdCard(), staffInfo.getAgencyId());
+        if (!resiDTO.getMoveInstatus()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请联系" + resiDTO.getResiAgencyName() + "迁出该居民后操作");
+        }
+
+        //3.判断是否需要更新居民信息
+        if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+                && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
+                && StringUtils.isNotBlank(formDTO.getIsReplace()) && !"0".equals(formDTO.getIsReplace()) && !"1".equals(formDTO.getIsReplace())) {
+            throw new EpmetException(EpmetErrorCode.IC_MOVE_IN.getCode(), EpmetErrorCode.IC_MOVE_IN.getMsg());
+        }
+        String resiUserId="";
+        //4.勾选了补充居民信息的
+        if ("1".equals(formDTO.getIsCheck())) {
+            IcResiUserTransferFormDTO change = new IcResiUserTransferFormDTO();
+            change.setType("in");
+            change.setNewAgencyId(staffInfo.getAgencyId());
+            change.setNewGridId(formDTO.getGridId());
+            change.setNewNeighborHoodId(formDTO.getVillageId());
+            change.setNewBuildingId(formDTO.getBuildId());
+            change.setNewBuildingUnitId(formDTO.getUnitId());
+            change.setNewHouseId(formDTO.getHomeId());
+            change.setTransferTime(new Date());
+            change.setReason(formDTO.getInReason());
+            change.setCustomerId(formDTO.getCustomerId());
+            change.setStaffId(formDTO.getUserId());
+            IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiUserEntity.class);
+            //状态改为0正常
+            entity.setStatus(NumConstant.ZERO_STR);
+            //4-1.本社区下正常状态居民且房屋不一样并选择了更新【只更新居民信息，插入调动记录，生成变更记录，不生成变更明细】
+            if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+                    && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
+                    && "1".equals(formDTO.getIsReplace())) {
+                resiUserId=resiDTO.getIcResiUserId();
+                entity.setId(resiDTO.getIcResiUserId());
+                change.setOrigin("change");
+                change.setIcUserId(entity.getId());
+                //先加记录，再修改，否则找不到原房屋
+                icUserTransferRecordService.moveResi(change);
+                icResiUserService.updateById(entity);
+            } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
+                //4-2.本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
+                resiUserId=resiDTO.getIcResiUserId();
+                entity.setId(resiDTO.getIcResiUserId());
+                change.setIcUserId(entity.getId());
+                change.setOrigin("in");
+                icUserTransferRecordService.moveResi(change);
+                icResiUserService.updateById(entity);
+            } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
+                //4-3.非本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
+                resiUserId=resiDTO.getIcResiUserId();
+                entity.setId(resiDTO.getIcResiUserId());
+                entity.setAgencyId(staffInfo.getAgencyId());
+                entity.setPids(staffInfo.getAgencyPIds());
+                change.setIcUserId(entity.getId());
+                change.setOrigin("in");
+                icUserTransferRecordService.moveResi(change);
+                icResiUserService.updateById(entity);
+            } else if (StringUtils.isBlank(resiDTO.getResiAgencyId())) {
+                //4-4.客户下不存在的居民(新数据)【新增居民信息，生成变更记录（新增）、不生成变更明细(因为十八类默认都是否)】
+                entity.setAgencyId(staffInfo.getAgencyId());
+                entity.setPids(staffInfo.getAgencyPIds());
+                //迁入管理-新增的居民，存储03
+                entity.setSubStatus(IcResiUserSubStatusEnum.MOVE_IN.getSubStatus());
+                icResiUserService.insert(entity);
+                change.setOrigin("add");
+                change.setIcUserId(entity.getId());
+                icUserTransferRecordService.moveResi(change);
+                resiUserId=entity.getId();
+            }
+        }
+
+        //5.生成迁入记录
+        IcMoveInRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcMoveInRecordEntity.class);
+        entity.setAgencyId(staffInfo.getAgencyId());
+        entity.setPids(staffInfo.getAgencyPIds());
         insert(entity);
+
+        //6.判断调用是否享受福利接口
+        if("1".equals(formDTO.getIsWelfare())){
+            ChangeWelfareDTO formDto = new ChangeWelfareDTO();
+            formDto.setUserId(resiUserId);
+            formDto.setName(formDTO.getName());
+            formDto.setIdCard(formDTO.getIdCard());
+            formDto.setMobile(formDTO.getMobile());
+            formDto.setGridId(formDTO.getGridId());
+            formDto.setGender(formDTO.getGender());
+            formDto.setJoinReason(formDTO.getInReason());
+            formDto.setCustomerId(formDTO.getCustomerId());
+            changeWelfareService.saveWelfareInfo(formDto);
+        }
+
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(IcMoveInRecordDTO dto) {
+    public void update(IcMoveInAddEditFormDTO dto) {
+        if (null == baseDao.selectById(dto.getMoveInId())) {
+            log.error(String.format("迁入记录信息修改失败，未查询到记录，迁入Id->%s", dto.getMoveInId()));
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "信息修改失败,未查询到迁入记录");
+        }
         IcMoveInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcMoveInRecordEntity.class);
+        entity.setId(dto.getMoveInId());
         updateById(entity);
     }
 
@@ -80,4 +247,41 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+    @Override
+    public IcMoveInListResultDTO detail(IcMoveInListFormDTO formDTO) {
+        IcMoveInListResultDTO resultDTO = new IcMoveInListResultDTO();
+        //1.查询迁入记录信息
+        List<IcMoveInListResultDTO> list = baseDao.selectMoveInList(formDTO);
+        //2.查询网格房屋信息
+        if (!CollectionUtils.isEmpty(list)) {
+            resultDTO = list.get(NumConstant.ZERO);
+            //查询房屋信息
+            Set<String> houseIds = new HashSet<>();
+            houseIds.add(resultDTO.getHomeId());
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+            List<HouseInfoDTO> houseInfoDTOList = houseInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
+            Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
+            if (null != houseInfoMap && houseInfoMap.containsKey(resultDTO.getHomeId())) {
+                resultDTO.setVillageName(houseInfoMap.get(resultDTO.getHomeId()).getNeighborHoodName());
+                resultDTO.setBuildName(houseInfoMap.get(resultDTO.getHomeId()).getBuildingName());
+                resultDTO.setUnitName(houseInfoMap.get(resultDTO.getHomeId()).getUnitName());
+                resultDTO.setHomeName(houseInfoMap.get(resultDTO.getHomeId()).getDoorName());
+                resultDTO.setAllName(houseInfoMap.get(resultDTO.getHomeId()).getAllName());
+            }
+            //获取网格缓存信息
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(resultDTO.getGridId());
+            if (null != gridInfo) {
+                resultDTO.setGridName(gridInfo.getGridName());
+            }
+            //与户主关系字典表数据
+            if(StringUtils.isNotBlank(resultDTO.getHouseholderRelation())){
+                Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
+                Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
+                resultDTO.setHouseholderRelationName(statusMap.get(resultDTO.getHouseholderRelation()));
+            }
+        }
+
+        return resultDTO;
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index 92712c498b..d44c421e5a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -25,7 +25,6 @@ import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.form.AddIcNatFormDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.form.SendNoticeFormDTO;
 import com.epmet.dto.result.*;
@@ -46,7 +45,6 @@ import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.util.IOUtils;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
index f5029f671c..a5ff0484c8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
@@ -24,8 +24,8 @@ import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Md5Util;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
-import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.dto.form.ExportResiUserFormDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index f2e3a26a9b..bc6582d1e0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -210,10 +210,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 //2021.11.25 新增需求 客户下身份证号唯一  start
                 if (map.containsKey("ID_CARD")) {
-                    IcResiUserDTO dto = new IcResiUserDTO();
-                    dto.setCustomerId(tokenDto.getCustomerId());
-                    dto.setIdCard(map.get("ID_CARD"));
-                    IcResiUserDTO userDTO = baseDao.getResiUser(dto);
+                    IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(map.get("ID_CARD"), tokenDto.getCustomerId());
                     if (null != userDTO && null != userDTO.getIdCard()) {
                         String errorMsg = "新增居民信息失败，身份证号已存在!";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
@@ -359,7 +356,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     IcResiUserDTO dto = new IcResiUserDTO();
                     dto.setCustomerId(tokenDto.getCustomerId());
                     dto.setIdCard(map.get("ID_CARD"));
-                    IcResiUserDTO userDTO = baseDao.getResiUser(dto);
+                    IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(map.get("ID_CARD"), dto.getCustomerId());
                     if (null != userDTO && null != userDTO.getIdCard()) {
                         String errorMsg = "修改居民信息失败，身份证号已存在!";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
@@ -1491,7 +1488,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         IcFormOptionsQueryFormDTO optionsQuery = new IcFormOptionsQueryFormDTO();
         optionsQuery.setCustomerId(customerId);
         optionsQuery.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
-        optionsQuery.setLabel("志愿者类别");
+        optionsQuery.setColumnName("VOLUNTEER_CATEGORY");
         List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery),
                 ServiceConstant.OPER_CUSTOMIZE_SERVER,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
@@ -1819,20 +1816,23 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             return resiResDTO;
         }
         //当前客户下，存在同身份证号的居民
+        if (NumConstant.TWO_STR.equals(icResiUserDTO.getStatus())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前居民状态2：注销", "当前身份证号对应居民已注销");
+        }
+        //用户状态：0:正常;1:迁出;可以继续执行
         resiResDTO.setIcResiUserId(icResiUserDTO.getId());
         resiResDTO.setStatus(icResiUserDTO.getStatus());
         resiResDTO.setResiAgencyId(icResiUserDTO.getAgencyId());
         resiResDTO.setResiHomeId(icResiUserDTO.getHomeId());
-        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(resiResDTO.getResiAgencyId());
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(icResiUserDTO.getAgencyId());
         if (null == agencyInfo) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询组织信息异常", EpmetErrorCode.SERVER_ERROR.getMsg());
         }
         resiResDTO.setResiAgencyName(agencyInfo.getOrganizationName());
         // 1.判断是否本社区居民，是的在判断是正常还是游离，正常的判断房屋跟之前是否一样，不一样的给提示是否更新，一样的直接更新居民信息，生成迁入记录，游离的直接更新居民信息，生成迁入记录
-        // 1.留给调用者去判断；
-
         // 2.判断不是本社区居民的，在判断是正常还是游离，正常的直接停止程序操作，游离的直接更新居民信息，生成迁入记录；
         if (!icResiUserDTO.getAgencyId().equals(agencyId) && !NumConstant.ONE_STR.equals(icResiUserDTO.getStatus())) {
+            //不是本社区内的居民且状态不是迁出的需要先联系居民现在所在的社区进行迁出操作；
             resiResDTO.setMoveInstatus(false);
         }
         return resiResDTO;
@@ -1843,4 +1843,90 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
 
 
+    @Override
+    public List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO) {
+        //如果是组织 且非顶级组织 则利用pids 查询 本级及下级
+        if (StringUtils.isNotBlank(formDTO.getAgencyId())){
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId());
+            if (agencyInfo == null){
+                log.warn("getResiUserGroupHomeId agencyId:{} is not exist",formDTO.getAgencyId());
+                return null;
+            }
+            if (!NumConstant.ZERO_STR.equals(agencyInfo.getPid())) {
+                String pids = agencyInfo.getPids().concat(StrConstant.COLON).concat(formDTO.getAgencyId());
+                formDTO.setPids(pids);
+            }
+        }
+
+        Page<HouseIcResiUserResultDTO> listPage = PageHelper
+                .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage())
+                .doSelectPage(()->baseDao.getResiUserGroupHomeId(formDTO));
+
+        List<String> dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode());
+        Map<String,Map<String, String>> dictResult = new HashMap<>();
+        dictTypeList.forEach(dict->{
+            Result<Map<String, String>> mapResult = epmetAdminOpenFeignClient.dictMap(dict);
+            if (mapResult!=null && mapResult.success()){
+                dictResult.put(dict,mapResult.getData());
+            }
+        });
+
+        //婚姻状况
+        Map<String, String> hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK");
+
+        //遍历数据 转换为中文
+        listPage.getResult().forEach(e->{
+            e.getHouseMemberList().parallelStream().forEach(o->{
+                if (StringUtils.isNotBlank(o.getIsParty())){
+                    o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty())?StrConstant.NO:StrConstant.YES);
+                }
+                if (StringUtils.isNotBlank(o.getGender())){
+                    o.setGender(GenderEnum.getName(o.getGender()));
+                }
+                if (StringUtils.isNotBlank(o.getIsTenant())){
+                    o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant())?StrConstant.NO:StrConstant.YES);
+                }
+                if (StringUtils.isNotBlank(o.getIsFloating())){
+                    o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating())?StrConstant.NO:StrConstant.YES);
+                }
+                Map<String, String> mzMap = dictResult.get(DictTypeEnum.NATION.getCode());
+                Map<String, String> whcdMap = dictResult.get(DictTypeEnum.EDUCATION.getCode());
+                Map<String, String> yhzgxMap = dictResult.get(DictTypeEnum.RELATIONSHIP.getCode());
+                if (StringUtils.isNotBlank(o.getMz())) {
+                    o.setMz(mzMap.get(o.getMz()));
+                }
+                if (StringUtils.isNotBlank(o.getCulture())) {
+                    o.setCulture(whcdMap.get(o.getCulture()));
+                }
+                if (StringUtils.isNotBlank(o.getYhzgx())) {
+                    o.setYhzgx(yhzgxMap.get(o.getYhzgx()));
+                }
+                if (StringUtils.isNotBlank(o.getHyzk())) {
+                    o.setHyzk(hyzkMap.get(o.getHyzk()));
+                }
+
+            });
+        });
+        return listPage.getResult();
+    }
+
+    /**
+     * desc:根据字段值获取 options
+     * @param customerId
+     * @param columnName
+     * @return
+     */
+    private Map<String, String> getOptionMap(String customerId,String columnName) {
+        IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
+        optionsForm.setCustomerId(customerId);
+        optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
+        optionsForm.setColumnName(columnName);
+        Result<List<IcFormItemOptionsDTO>> listResult = operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm);
+        if (!listResult.success()){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取item失败,"+listResult.getInternalMsg());
+        }
+        return listResult.getData().stream()
+                .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1));
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java
index 42bf629675..26ba2b9e9c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcStatsResiWarnServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -27,17 +28,13 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcStatsResiWarnDao;
-import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.IcStatsResiWarnDTO;
-import com.epmet.dto.PersonWarnLeftPieDTO;
 import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO;
 import com.epmet.dto.result.PersonWarnLeftPieResultDTO;
 import com.epmet.entity.IcStatsResiWarnEntity;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
-import com.epmet.redis.IcStatsResiWarnRedis;
 import com.epmet.service.IcStatsResiWarnService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -169,4 +166,4 @@ public class IcStatsResiWarnServiceImpl extends BaseServiceImpl<IcStatsResiWarnD
         return result;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 96f75da893..5c3bada17e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -18,9 +18,9 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.IcResiUserConstant;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserTransferRecordDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
@@ -130,6 +131,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
 
         //5.生成调动记录
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        //只有迁出到本客户内其他房屋的才会有newXXX信息。
         IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData());
         insert(recordEntity);
 
@@ -160,7 +162,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : afterName.toString());
         changeRecordEntity.setChangeTime(formDTO.getTransferTime());
         changeRecordEntity.setReason(formDTO.getReason());
-        changeRecordEntity.setRemark(formDTO.getRemark());
+        changeRecordEntity.setRemark(StringUtils.isNotBlank(formDTO.getRemark()) ? formDTO.getRemark() : "调动居民");
         icUserChangeRecordService.insert(changeRecordEntity);
         //6-2.变更明细【类别明细迁出组织的-1，迁入组织的1】
         IcResiCategoryStatsConfigDTO dto = new IcResiCategoryStatsConfigDTO();
@@ -171,7 +173,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         }
         List<String> columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList());
         Map<String, String> map = icResiUserDao.getCategoryListMap(columns, formDTO.getIcUserId());
-        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeDetailed(categoryListResult.getData(), map, changeRecordEntity.getId(), formDTO, resiUserDTO, NumConstant.ONE_STR);
+        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeDetailed(categoryListResult.getData(), map, changeRecordEntity.getId(), formDTO, resiUserDTO, IcResiUserConstant.CHANGE);
         icUserChangeDetailedService.insertBatch(changeDetailedEntityList);
 
     }
@@ -202,6 +204,9 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         recordEntity.setTransferTime(formDTO.getTransferTime());
         recordEntity.setRemark(formDTO.getRemark());
         if ("in".equals(formDTO.getType())) {
+            //变动：迁出类型为本客户内的房子
+            //迁出：迁出类型为本客户内的房子
+            //迁入：同社区的居民，状态正常，改变了房屋  目前这三种情况 type="in";
             recordEntity.setNewCustomerId(resiUserDTO.getCustomerId());
             recordEntity.setNewAgencyId(formDTO.getNewAgencyId());
             recordEntity.setNewAgencyName(result2.getAgencyDTO().getOrganizationName());
@@ -222,6 +227,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
 
     /**
      * @param  origin 1:变动；2：迁出；3：死亡
+     * @param  origin:变动：change; 迁出：out;    死亡：died; 出生birth; 迁入：in
      * @Author sun
      * @Description 变更明细
      **/
@@ -236,41 +242,67 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         IcUserChangeDetailedEntity inEntity = null;
         AgencyInfoCache oldAgencyInfo = CustomerOrgRedis.getAgencyInfo(resiUserDTO.getAgencyId());
         if (null == oldAgencyInfo) {
-            throw new EpmetException(String.format("查询组织信息失败%s", resiUserDTO.getAgencyId()));
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("查询居民当前所属组织信息失败agencyId:%s", resiUserDTO.getAgencyId()), "获取组织信息异常");
         }
         AgencyInfoCache newAgencyInfo = new AgencyInfoCache();
-        if ("in".equals(formDTO.getType())) {
-            newAgencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getNewAgencyId());
-            if (null == newAgencyInfo) {
-                throw new EpmetException(String.format("查询组织信息失败%s", formDTO.getNewAgencyId()));
+        if (!IcResiUserConstant.DIED.equals(origin)) {
+            //变动和迁出才会校验新组织
+            if ("in".equals(formDTO.getType())) {
+                newAgencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getNewAgencyId());
+                if (null == newAgencyInfo) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("查询新组织信息失败newAgencyId:%s", formDTO.getNewAgencyId()), "获取组织信息异常");
+                }
             }
         }
         for (IcResiCategoryStatsConfigDTO cf : configList) {
             if ("1".equals(map.get(cf.getColumnName()))) {
-                //迁出
-                outEntity = new IcUserChangeDetailedEntity();
-                outEntity.setCustomerId(formDTO.getCustomerId());
-                outEntity.setIcUserChangeRecordId(icUserChangeRecordId);
-                outEntity.setPids(oldAgencyInfo.getPids());
-                outEntity.setAgencyId(resiUserDTO.getAgencyId());
-                outEntity.setGridId(resiUserDTO.getGridId());
-                outEntity.setNeighborHoodId(resiUserDTO.getVillageId());
-                outEntity.setBuildingId(resiUserDTO.getBuildId());
-                outEntity.setBuildingUnitId(resiUserDTO.getUnitId());
-                outEntity.setHouseId(resiUserDTO.getHomeId());
-                outEntity.setIcUserId(formDTO.getIcUserId());
-                if (NumConstant.ONE_STR.equals(origin) || NumConstant.TWO_STR.equals(origin)) {
-                    outEntity.setType("out");
-                    outEntity.setTypeName("迁出");
-                }else if( NumConstant.THREE_STR.equals(origin)){
-                    outEntity.setType("die");
-                    outEntity.setTypeName("死亡");
+                if (IcResiUserConstant.CHANGE.equals(origin) || IcResiUserConstant.OUT.equals(origin) || IcResiUserConstant.DIED.equals(origin)) {
+                    //本社区的居民，状态正常，在迁入登记界面，变更了房屋信息，旧的房屋-1
+                    //迁出登记时居民当前所属的房屋，-1
+                    //死忙登记时居民当前所属的房屋，-1
+                    outEntity = new IcUserChangeDetailedEntity();
+                    outEntity.setCustomerId(formDTO.getCustomerId());
+                    outEntity.setIcUserChangeRecordId(icUserChangeRecordId);
+                    outEntity.setPids(oldAgencyInfo.getPids());
+                    outEntity.setAgencyId(resiUserDTO.getAgencyId());
+                    outEntity.setGridId(resiUserDTO.getGridId());
+                    outEntity.setNeighborHoodId(resiUserDTO.getVillageId());
+                    outEntity.setBuildingId(resiUserDTO.getBuildId());
+                    outEntity.setBuildingUnitId(resiUserDTO.getUnitId());
+                    outEntity.setHouseId(resiUserDTO.getHomeId());
+                    outEntity.setIcUserId(formDTO.getIcUserId());
+                    if (IcResiUserConstant.CHANGE.equals(origin) || IcResiUserConstant.OUT.equals(origin)) {
+                        outEntity.setType("out");
+                        outEntity.setTypeName("迁出");
+                    } else if (IcResiUserConstant.DIED.equals(origin)) {
+                        outEntity.setType("die");
+                        outEntity.setTypeName("死亡");
+                    }
+                    outEntity.setFieldName(cf.getColumnName());
+                    outEntity.setValue(-1);
+                    list.add(outEntity);
                 }
-                outEntity.setFieldName(cf.getColumnName());
-                outEntity.setValue(-1);
-                list.add(outEntity);
                 //原来的变动，并且是迁入到同客户内走下面的流程
-                if ("in".equals(formDTO.getType()) && NumConstant.ONE_STR.equals(origin)) {
+                if ("in".equals(formDTO.getType()) && IcResiUserConstant.CHANGE.equals(origin)) {
+                    //本社区的居民，状态正常，在迁入登记界面，变更了房屋信息，新的房屋+1
+                    inEntity = new IcUserChangeDetailedEntity();
+                    inEntity.setCustomerId(formDTO.getCustomerId());
+                    inEntity.setIcUserChangeRecordId(icUserChangeRecordId);
+                    inEntity.setPids(newAgencyInfo.getPids());
+                    inEntity.setAgencyId(formDTO.getNewAgencyId());
+                    inEntity.setGridId(formDTO.getNewGridId());
+                    inEntity.setNeighborHoodId(formDTO.getNewNeighborHoodId());
+                    inEntity.setBuildingId(formDTO.getNewBuildingId());
+                    inEntity.setBuildingUnitId(formDTO.getNewBuildingUnitId());
+                    inEntity.setHouseId(formDTO.getNewHouseId());
+                    inEntity.setIcUserId(formDTO.getIcUserId());
+                    inEntity.setType("in");
+                    inEntity.setTypeName("迁入");
+                    inEntity.setFieldName(cf.getColumnName());
+                    inEntity.setValue(1);
+                    list.add(inEntity);
+                }else if(IcResiUserConstant.IN.equals(origin)){
+                    //已经是游离的，办理迁入登记：
                     inEntity = new IcUserChangeDetailedEntity();
                     inEntity.setCustomerId(formDTO.getCustomerId());
                     inEntity.setIcUserChangeRecordId(icUserChangeRecordId);
@@ -282,6 +314,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                     inEntity.setBuildingUnitId(formDTO.getNewBuildingUnitId());
                     inEntity.setHouseId(formDTO.getNewHouseId());
                     inEntity.setIcUserId(formDTO.getIcUserId());
+                    //出生和迁入 =》迁入
                     inEntity.setType("in");
                     inEntity.setTypeName("迁入");
                     inEntity.setFieldName(cf.getColumnName());
@@ -301,7 +334,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void moveOutResi(IcResiUserTransferFormDTO formDTO) {
+    public void moveResi(IcResiUserTransferFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, IcResiUserTransferFormDTO.TransferAdd.class);
         //1.判断被调动人员是否有效
         IcResiUserDTO resiUserDTO = getIcResiUserDTO(formDTO.getCustomerId(), formDTO.getIcUserId());
@@ -312,8 +345,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
 
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
-        //5.生成调动记录:  只有迁出的才生成
-        if("out".equals(formDTO.getMoveType())){
+        //5.生成调动记录:  只有迁入，或者房屋变更（变动）的才生成居民调动记录表ic_user_transfer_record记录
+        if (IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) {
             IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData());
             insert(recordEntity);
             changeRecordEntity.setIcUserTransferRecordId(recordEntity.getId());
@@ -326,26 +359,41 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         changeRecordEntity.setIcUserId(formDTO.getIcUserId());
         changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
         changeRecordEntity.setIcUserName(resiUserDTO.getName());
-        //迁出存调动，死亡存注销
-        if ("out".equals(formDTO.getMoveType())) {
+        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())
+                || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())
+                || IcResiUserConstant.IN.equals(formDTO.getOrigin())) {
+            //迁出管理、迁出都属于调动
             changeRecordEntity.setType("transfer");
             changeRecordEntity.setTypeName("调动");
-        } else if ("died".equals(formDTO.getMoveType())) {
+        } else if (IcResiUserConstant.DIED.equals(formDTO.getOrigin())) {
             changeRecordEntity.setType("logout");
             changeRecordEntity.setTypeName("注销");
+        } else if (IcResiUserConstant.ADD.equals(formDTO.getOrigin())) {
+            changeRecordEntity.setType("add");
+            changeRecordEntity.setTypeName("新增");
         }
-        StringBuffer beforeName = new StringBuffer();
-        beforeName.append(icResiUserOrgMsgResultDTO.getAgencyDTO().getOrganizationName()).append("-").append(icResiUserOrgMsgResultDTO.getGridDTO().getGridName()).append("-")
-                .append(icResiUserOrgMsgResultDTO.getNeighborHoodDTO().getNeighborHoodName()).append("-").append(icResiUserOrgMsgResultDTO.getBuildingDTO().getBuildingName()).append("-")
-                .append(icResiUserOrgMsgResultDTO.getBuildingUnitDTO().getUnitName()).append("-").append(icResiUserOrgMsgResultDTO.getHouseDTO().getHouseName());
-        changeRecordEntity.setBeforeChangeName(beforeName.toString());
-        StringBuffer afterName = new StringBuffer();
-        if ("in".equals(formDTO.getType())) {
-            afterName.append(result2.getData().getAgencyDTO().getOrganizationName()).append("-").append(result2.getData().getGridDTO().getGridName()).append("-")
-                    .append(result2.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result2.getData().getBuildingDTO().getBuildingName()).append("-")
-                    .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getHouseName());
+        //迁入、迁出、变更
+        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())
+                || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())
+                || IcResiUserConstant.IN.equals(formDTO.getOrigin())) {
+            StringBuffer beforeName = new StringBuffer();
+            beforeName.append(icResiUserOrgMsgResultDTO.getAgencyDTO().getOrganizationName()).append("-").append(icResiUserOrgMsgResultDTO.getGridDTO().getGridName()).append("-")
+                    .append(icResiUserOrgMsgResultDTO.getNeighborHoodDTO().getNeighborHoodName()).append("-").append(icResiUserOrgMsgResultDTO.getBuildingDTO().getBuildingName()).append("-")
+                    .append(icResiUserOrgMsgResultDTO.getBuildingUnitDTO().getUnitName()).append("-").append(icResiUserOrgMsgResultDTO.getHouseDTO().getDoorName());
+            changeRecordEntity.setBeforeChangeName(beforeName.toString());
+            StringBuffer afterName = new StringBuffer();
+            if ("in".equals(formDTO.getType())) {
+                afterName.append(result2.getData().getAgencyDTO().getOrganizationName()).append("-").append(result2.getData().getGridDTO().getGridName()).append("-")
+                        .append(result2.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result2.getData().getBuildingDTO().getBuildingName()).append("-")
+                        .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getDoorName());
+            }
+            if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())) {
+                changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : "拟迁入：".concat(afterName.toString()));
+            } else {
+                changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : afterName.toString());
+            }
         }
-        changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : afterName.toString());
+
         changeRecordEntity.setChangeTime(formDTO.getTransferTime());
         changeRecordEntity.setReason(formDTO.getReason());
         changeRecordEntity.setRemark(formDTO.getRemark());
@@ -355,11 +403,11 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         dto.setCustomerId(formDTO.getCustomerId());
         Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(dto);
         if (!categoryListResult.success()) {
-            throw new RenException("人员调动，获取客户居民类别预警配置表数据失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取客户居民类别预警配置表数据失败", "获取客户居民类别预警配置异常");
         }
         List<String> columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList());
         Map<String, String> map = icResiUserDao.getCategoryListMap(columns, formDTO.getIcUserId());
-        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeDetailed(categoryListResult.getData(), map, changeRecordEntity.getId(), formDTO, resiUserDTO, NumConstant.TWO_STR);
+        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeDetailed(categoryListResult.getData(), map, changeRecordEntity.getId(), formDTO, resiUserDTO, formDTO.getOrigin());
         icUserChangeDetailedService.insertBatch(changeDetailedEntityList);
     }
 
@@ -374,7 +422,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
     private IcResiUserDTO getIcResiUserDTO(String customerId, String icUserId) {
         IcResiUserDTO resiUserDTO = icResiUserDao.selectIdByIdCard(customerId, null, icUserId);
         if (null == resiUserDTO) {
-            throw new RenException("9000", "人员调动失败，被调动人不存在！");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("ic_resi_user  is null customerId:%s,icUserId:%s", customerId, icUserId), "当前居民不存在");
         }
         return resiUserDTO;
     }
@@ -395,8 +443,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         Result<IcResiUserOrgMsgResultDTO> result1 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO1);
         if (!result1.success() || null == result1.getData().getAgencyDTO() || null == result1.getData().getGridDTO() || null == result1.getData().getNeighborHoodDTO()
                 || null == result1.getData().getBuildingDTO() || null == result1.getData().getBuildingUnitDTO() || null == result1.getData().getHouseDTO()) {
-            log.warn("查找被调动人调动前的组织、网格、小区、楼栋、单元、房屋信息失败");
-            throw new RenException("9000", "获取被调动人基础信息失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找被调动人调动前的组织、网格、小区、楼栋、单元、房屋信息失败", "居民当前所住房屋信息异常");
         }
         return result1.getData();
     }
@@ -408,7 +455,13 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
      */
     private Result<IcResiUserOrgMsgResultDTO> getNewHouseInfo(IcResiUserTransferFormDTO formDTO) {
         Result<IcResiUserOrgMsgResultDTO> result2 = new Result<>();
-        if ("out".equals(formDTO.getMoveType())) {
+        if ((IcResiUserConstant.IN.equals(formDTO.getOrigin())
+                || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())
+                || IcResiUserConstant.OUT.equals(formDTO.getOrigin()))
+                && "in".equals(formDTO.getType())) {
+            //迁入管理-迁入登记
+            //变更
+            //迁出管理-拟迁入的
             IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO();
             orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId());
             orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId());
@@ -420,8 +473,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
             result2 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO2);
             if (!result2.success() || null == result2.getData().getAgencyDTO() || null == result2.getData().getGridDTO() || null == result2.getData().getNeighborHoodDTO()
                     || null == result2.getData().getBuildingDTO() || null == result2.getData().getBuildingUnitDTO() || null == result2.getData().getHouseDTO()) {
-                log.warn("查找被调动人调动后的组织、网格、小区、楼栋、单元、房屋信息失败");
-                throw new RenException("9000", "获取被调动人基础信息失败");
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找迁入后的组织、网格、小区、楼栋、单元、房屋信息失败", "所属房屋信息异常");
             }
         }
         return result2;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineRelationServiceImpl.java
index 6920ddf8d5..8e2d0cb793 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineRelationServiceImpl.java
@@ -3,9 +3,9 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcVaccineRelationDao;
 import com.epmet.dto.IcVaccineRelationDTO;
 import com.epmet.entity.IcVaccineRelationEntity;
@@ -79,4 +79,4 @@ public class IcVaccineRelationServiceImpl extends BaseServiceImpl<IcVaccineRelat
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
index f138bba0ba..1f33bbb603 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
@@ -19,7 +19,6 @@ import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.IcVaccineRelationDao;
 import com.epmet.dto.IcVaccineDTO;
-import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
@@ -29,7 +28,6 @@ import com.epmet.dto.result.VaccineListDTO;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
 import com.epmet.entity.IcVaccineRelationEntity;
-import com.epmet.entity.UserAdviceEntity;
 import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.excel.data.IcVaccineImportExcelData;
 import com.epmet.excel.handler.IcVaccineExcelImportListener;
@@ -43,7 +41,6 @@ import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.util.IOUtils;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
index f3dddd6a59..2ebbcb49ac 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
@@ -22,11 +22,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.enums.SuperAdminEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.OperUserDao;
 import com.epmet.dto.OperUserDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.java
index 7c0730af71..75e8eeac54 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ResiUserBadgeServiceImpl.java
@@ -20,15 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ResiUserBadgeDao;
 import com.epmet.dto.ResiUserBadgeDTO;
 import com.epmet.entity.ResiUserBadgeEntity;
 import com.epmet.service.ResiUserBadgeService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -98,4 +97,4 @@ public class ResiUserBadgeServiceImpl extends BaseServiceImpl<ResiUserBadgeDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
index be443d9651..3657bddf69 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
@@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.RoleDao;
 import com.epmet.dao.StaffRoleDao;
 import com.epmet.dao.UserRoleDao;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
index d76e08c884..9863296079 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
@@ -25,14 +25,13 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.GridVisitedConstant;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.StaffGridVisitedDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.StaffGridVisitedDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.form.StaffGridVisitedFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.entity.StaffGridVisitedEntity;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffGridVisitedService;
@@ -160,4 +159,4 @@ public class StaffGridVisitedServiceImpl extends BaseServiceImpl<StaffGridVisite
         return new Result<CustomerGridByUserIdResultDTO>().ok(gridResult);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index 6b69b9506b..b8f34b04c9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -32,7 +32,6 @@ import com.epmet.entity.StaffRoleEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.StaffRoleService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java
index 03467b2c30..b1f0005f6a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java
@@ -5,12 +5,12 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.PatrolConstant;
 import com.epmet.dao.StatsStaffPatrolRecordDailyDao;
+import com.epmet.dto.form.PatrolCountFormDTO;
+import com.epmet.dto.result.PatrolCountResultDTO;
 import com.epmet.dto.result.PatrolYuShanResultDTO;
 import com.epmet.dto.result.SelectPatrolCountResultDTO;
 import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.service.StatsStaffPatrolRecordDailyService;
-import com.epmet.dto.form.PatrolCountFormDTO;
-import com.epmet.dto.result.PatrolCountResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -60,4 +60,4 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<Stat
     public List<PatrolYuShanResultDTO> patrolInfo(String agencyId) {
         return baseDao.patrolInfo(agencyId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
index 3f189b5426..a6480dca76 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -32,7 +33,6 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.UserAdviceConstant;
@@ -41,7 +41,10 @@ import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.dto.result.AdviceListResultDTO;
+import com.epmet.dto.result.MyAdviceListResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserAdviceEntity;
 import com.epmet.entity.UserAdviceImgEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
index 1272b57629..99a4817aa7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
@@ -69,7 +69,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
         IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
         optionsForm.setCustomerId(customerId);
         optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
-        optionsForm.setLabel("志愿者类别");
+        optionsForm.setColumnName("VOLUNTEER_CATEGORY");
 
         String errorMsg = "【志愿者分布】查询志愿者图例失败";
         List<IcFormItemOptionsDTO> options = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm),
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql
new file mode 100644
index 0000000000..4db8d747fb
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql
@@ -0,0 +1 @@
+alter table pli_change_death add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间';
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql
new file mode 100644
index 0000000000..e3dcc95e77
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.45__move_and_birth.sql
@@ -0,0 +1,70 @@
+CREATE TABLE `ic_birth_record` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id',
+  `PIDS` varchar(255) NOT NULL COMMENT '组织的pids',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
+  `VILLAGE_ID` varchar(64) NOT NULL COMMENT '所属小区ID',
+  `BUILD_ID` varchar(64) NOT NULL COMMENT '所属楼宇Id',
+  `UNIT_ID` varchar(64) NOT NULL COMMENT '单元id',
+  `HOME_ID` varchar(64) NOT NULL COMMENT '所属家庭Id',
+  `NAME` varchar(64) NOT NULL COMMENT '姓名',
+  `MOBILE` varchar(15) DEFAULT NULL COMMENT '手机号',
+  `GENDER` char(2) DEFAULT NULL COMMENT '性别',
+  `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号',
+  `BIRTHDAY` varchar(64) DEFAULT NULL COMMENT '出生日期',
+  `BIRTHPLACE` varchar(255) NOT NULL COMMENT '出生地',
+  `IS_WELFARE` char(1) DEFAULT NULL COMMENT '是否享受福利【否:0 是:1】',
+  `FATHER` varchar(64) DEFAULT NULL COMMENT '父亲姓名',
+  `MOTHER` varchar(64) DEFAULT NULL COMMENT '母亲姓名',
+  `COUNT` int(2) DEFAULT NULL COMMENT '胎次',
+  `REPORT_DATE` varchar(64) DEFAULT NULL COMMENT '申报日期',
+  `HOUSEHOLDER_NAME` varchar(64) DEFAULT NULL COMMENT '户主姓名',
+  `HOUSEHOLDER_RELATION` char(1) DEFAULT NULL COMMENT '与户主关系【字典表】',
+  `IS_CHECK` char(1) DEFAULT '0' COMMENT '是否勾选补充居民信息0否 1是',
+  `DEL_FLAG` int(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='出生管理';
+
+-- ----------------------------
+-- Table structure for ic_move_in_record
+-- ----------------------------
+CREATE TABLE `ic_move_in_record` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id',
+  `PIDS` varchar(255) NOT NULL COMMENT '组织的pids',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
+  `VILLAGE_ID` varchar(64) NOT NULL COMMENT '所属小区ID',
+  `BUILD_ID` varchar(64) NOT NULL COMMENT '所属楼宇Id',
+  `UNIT_ID` varchar(64) NOT NULL COMMENT '单元id',
+  `HOME_ID` varchar(64) NOT NULL COMMENT '所属家庭Id',
+  `NAME` varchar(64) NOT NULL COMMENT '姓名',
+  `IS_WELFARE` char(1) DEFAULT NULL COMMENT '是否享受福利【否:0 是:1】',
+  `IS_CHECK` char(1) DEFAULT '0' COMMENT '是否勾选补充居民信息0否 1是',
+  `MOBILE` varchar(11) DEFAULT NULL COMMENT '手机号',
+  `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号',
+  `GENDER` char(2) DEFAULT NULL COMMENT '性别（1男2女0未知）',
+  `AGE` int(3) DEFAULT NULL COMMENT '年龄',
+  `IN_TIME` datetime NOT NULL COMMENT '迁入时间',
+  `IN_REASON` varchar(512) NOT NULL COMMENT '迁入原因',
+  `SOURCE_ADDRESS_CODE` varchar(32) DEFAULT NULL COMMENT '来源地区编码',
+  `SOURCE_ADDRESS_PATH_CODE` varchar(64) DEFAULT NULL COMMENT '来源地区编码全路径',
+  `SOURCE_ADDRESS` varchar(255) NOT NULL COMMENT '来源地区地址',
+  `ADDRESS` varchar(128) NOT NULL COMMENT '详细地址',
+  `MOVE_NUMBER` varchar(64) DEFAULT NULL COMMENT '迁移证号码',
+  `HOUSEHOLDER_NAME` varchar(64) DEFAULT NULL COMMENT '户主姓名',
+  `HOUSEHOLDER_RELATION` varchar(64) DEFAULT NULL COMMENT '与户主关系[字典表]',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='迁入管理记录';
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.46__modify_move_outreason.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.46__modify_move_outreason.sql
new file mode 100644
index 0000000000..45c22c557c
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.46__modify_move_outreason.sql
@@ -0,0 +1 @@
+alter table pli_change_relocation MODIFY COLUMN `REASON` varchar(255) DEFAULT NULL COMMENT '迁出原因' AFTER OLD_HOME;
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.47__update_substatus.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.47__update_substatus.sql
new file mode 100644
index 0000000000..08a8677e92
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.47__update_substatus.sql
@@ -0,0 +1,6 @@
+UPDATE ic_resi_user
+SET SUB_STATUS = '01'
+WHERE
+	DEL_FLAG = '0'
+	AND `STATUS` = '0'
+	AND (SUB_STATUS = '' OR SUB_STATUS IS NULL);
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.48__pli_change.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.48__pli_change.sql
new file mode 100644
index 0000000000..bdb94c1b72
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.48__pli_change.sql
@@ -0,0 +1,119 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : epmet_test_user
+ Source Server Type    : MySQL
+ Source Server Version : 50732
+ Source Host           : 118.190.150.119:13306
+ Source Schema         : epmet_user
+
+ Target Server Type    : MySQL
+ Target Server Version : 50732
+ File Encoding         : 65001
+
+ Date: 13/05/2022 10:30:50
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for pli_change_welfare
+-- ----------------------------
+DROP TABLE IF EXISTS `pli_change_welfare`;
+CREATE TABLE `pli_change_welfare`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'epmet用户主键',
+  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'epmet网格ID',
+  `NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '姓名',
+  `ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '身份证',
+  `MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号',
+  `GENDER` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别 0女 1男',
+  `TYPE` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型',
+  `JOIN_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加入时间',
+  `JOIN_REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加入原因',
+  `REMOVE_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '移除时间',
+  `REMOVE_REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '移除原因',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epdc_master_topic_USER_ID_IDX`(`USER_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '福利表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for pli_change_relocation
+-- ----------------------------
+DROP TABLE IF EXISTS `pli_change_relocation`;
+CREATE TABLE `pli_change_relocation`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '姓名',
+  `ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '身份证号',
+  `GENDER` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别  0女 1男',
+  `AGE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年龄',
+  `MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号',
+  `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织PID',
+  `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织ID',
+  `AGENCY_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织名',
+  `VILLAGE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋小区ID',
+  `VILLAGE_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋小区',
+  `BUILD_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '楼号ID',
+  `BUILD_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '楼号',
+  `UNIT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单元ID',
+  `UNIT_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单元',
+  `HOME_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋ID',
+  `HOME_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋',
+  `ADDRESS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外迁详细地址',
+  `TYPE` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '操作类型【客户外out,客户内in】',
+  `OWNER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原房主姓名',
+  `OLD_DEPT` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原网格信息',
+  `OLD_ADDRESS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原房屋信息',
+  `OLD_HOME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原房间号',
+  `REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '迁出原因',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  `OUT_OF_TIME` date NULL DEFAULT NULL COMMENT '迁出时间',
+  `IC_USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'epmet用户主键',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epdc_master_topic_USER_ID_IDX`(`HOME_NAME`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '迁出表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for pli_change_death
+-- ----------------------------
+DROP TABLE IF EXISTS `pli_change_death`;
+CREATE TABLE `pli_change_death`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'epmet用户主键',
+  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'epmet网格ID',
+  `NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '姓名',
+  `ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '身份证',
+  `MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号',
+  `GENDER` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别 0女 1男',
+  `TYPE` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型 0 租客 1 房东',
+  `JOIN_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加入时间',
+  `JOIN_REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加入原因',
+  `REMOVE_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '移除时间',
+  `REMOVE_REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '移除原因',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  `DEATH_DATE` date NULL DEFAULT NULL COMMENT '死亡时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epdc_master_topic_USER_ID_IDX`(`USER_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '死亡名单表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
index f0b82bc672..0aee29f22a 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
@@ -24,5 +24,52 @@
         <result property="customerId" column="CUSTOMER_ID"/>
     </resultMap>
 
-
+    <select id="getDeathList" resultType="com.epmet.dto.ChangeDeathDTO">
+        SELECT
+            d.*
+        FROM
+            pli_change_death d
+            LEFT JOIN pli_change_welfare w ON d.ID_CARD = w.ID_CARD
+            AND w.DEL_FLAG = '0'
+        WHERE
+            d.DEL_FLAG = '0'
+        <if test="gridId != null and gridId != ''">
+            AND d.GRID_ID = #{gridId}
+        </if>
+        <if test="villageId != null and villageId != ''">
+            AND d.VILLAGE_ID = #{villageId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+            AND d.BUILD_ID = #{buildId}
+        </if>
+        <if test="unitId != null and unitId != ''">
+            AND d.UNIT_ID = #{unitId}
+        </if>
+        <if test="homeId != null and homeId != ''">
+            AND d.HOME_ID = #{homeId}
+        </if>
+        <if test="name != null and name != ''">
+            AND d.NAME = #{name}
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND d.ID_CARD = #{idCard}
+        </if>
+        <if test="mobile != null and mobile != ''">
+            AND d.MOBILE = #{mobile}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND d.DEATH_DATE >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND d.DEATH_DATE &lt;= #{endTime}
+        </if>
+        <if test="isWelfare != null and isWelfare != ''">
+            <if test="isWelfare == '0' or isWelfare == 0">
+                AND w.DEL_FLAG = '0'
+            </if>
+            <if test="isWelfare == '1' or isWelfare == 1">
+                AND w.DEL_FLAG IS NULL
+            </if>
+        </if>
+    </select>
 </mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
index 9f1dea222d..fa7458bdf8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
@@ -35,5 +35,52 @@
         <result property="customerId" column="CUSTOMER_ID"/>
     </resultMap>
 
-
+    <select id="getRelocationList" resultType="com.epmet.dto.ChangeRelocationDTO">
+        SELECT
+            r.*
+        FROM
+            pli_change_relocation r
+            LEFT JOIN pli_change_welfare w ON r.ID_CARD = w.ID_CARD
+            AND w.DEL_FLAG = '0'
+        WHERE
+            r.DEL_FLAG = '0'
+        <if test="gridId != null and gridId != ''">
+            AND r.GRID_ID = #{gridId}
+        </if>
+        <if test="villageId != null and villageId != ''">
+            AND r.VILLAGE_ID = #{villageId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+            AND r.BUILD_ID = #{buildId}
+        </if>
+        <if test="unitId != null and unitId != ''">
+            AND r.UNIT_ID = #{unitId}
+        </if>
+        <if test="homeId != null and homeId != ''">
+            AND r.HOME_ID = #{homeId}
+        </if>
+        <if test="name != null and name != ''">
+            AND r.NAME = #{name}
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND r.ID_CARD = #{idCard}
+        </if>
+        <if test="mobile != null and mobile != ''">
+            AND r.MOBILE = #{mobile}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND r.OUT_OF_TIME >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND r.OUT_OF_TIME &lt;= #{endTime}
+        </if>
+        <if test="isWelfare != null and isWelfare != ''">
+            <if test="isWelfare == '0' or isWelfare == 0">
+                AND w.DEL_FLAG = '0'
+            </if>
+            <if test="isWelfare == '1' or isWelfare == 1">
+                AND w.DEL_FLAG IS NULL
+            </if>
+        </if>
+    </select>
 </mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
index 496518260b..423c38d57e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
@@ -34,7 +34,13 @@
             set REMOVE_DATE=#{removeDate},
                 REMOVE_REASON=#{removeReason},
                 del_flag='1'
-            where id=#{id}
+            where del_flag='0'
+        <if test="id != null and id != ''">
+            AND ID = #{id}
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND ID_CARD = #{idCard}
+        </if>
     </update>
 
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
new file mode 100644
index 0000000000..52a3ce76eb
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
@@ -0,0 +1,39 @@
+<?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.epmet.dao.IcBirthRecordDao">
+
+    <resultMap type="com.epmet.entity.IcBirthRecordEntity" id="icBirthRecordMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="villageId" column="VILLAGE_ID"/>
+        <result property="buildId" column="BUILD_ID"/>
+        <result property="unitId" column="UNIT_ID"/>
+        <result property="homeId" column="HOME_ID"/>
+        <result property="name" column="NAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="gender" column="GENDER"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="birthday" column="BIRTHDAY"/>
+        <result property="birthplace" column="BIRTHPLACE"/>
+        <result property="isWeifare" column="IS_WEIFARE"/>
+        <result property="father" column="FATHER"/>
+        <result property="monther" column="MONTHER"/>
+        <result property="count" column="COUNT"/>
+        <result property="reportDate" column="REPORT_DATE"/>
+        <result property="householderName" column="HOUSEHOLDER_NAME"/>
+        <result property="householderRelation" column="HOUSEHOLDER_RELATION"/>
+        <result property="isCheck" column="IS_CHECK"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
index 9e8c575fdd..eae6a3e826 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
@@ -3,6 +3,72 @@
 
 <mapper namespace="com.epmet.dao.IcMoveInRecordDao">
 
-
+    <select id="selectMoveInList" resultType="com.epmet.dto.result.IcMoveInListResultDTO">
+        SELECT
+            id moveInId,
+            grid_id gridId,
+            village_id villageId,
+            build_id buildId,
+            unit_id unitId,
+            home_id homeId,
+            name NAME,
+            is_welfare isWeifare,
+            is_check isCheck,
+            mobile mobile,
+            id_card idCard,
+            gender gender,
+            IF(gender='1','男',IF(gender='2','女','未知'))genderName,
+            age age,
+            in_time inTime,
+            in_reason inReason,
+            source_address_code sourceAddressCode,
+            source_address_path_code sourceAddressPathCode,
+            source_address sourceAddress,
+            address address,
+            move_number moveNumber,
+            householder_name householderName,
+            householder_relation householderRelation
+        FROM
+            ic_move_in_record
+        WHERE
+            del_flag = '0'
+        <if test="gridId != null and gridId != '' ">
+            AND grid_id = #{gridId}
+        </if>
+        <if test="villageId != null and villageId != '' ">
+            AND village_id = #{villageId}
+        </if>
+        <if test="buildId != null and buildId != '' ">
+            AND build_id = #{buildId}
+        </if>
+        <if test="unitId != null and unitId != '' ">
+            AND unit_id = #{unitId}
+        </if>
+        <if test="homeId != null and homeId != '' ">
+            AND home_id = #{homeId}
+        </if>
+        <if test="name != null and name != '' ">
+            AND `name` LIKE CONCAT('%', #{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != '' ">
+            AND mobile = #{mobile}
+        </if>
+        <if test="idCard != null and idCard != '' ">
+            AND id_card = #{idCard}
+        </if>
+        <if test="startTime != null and startTime != '' ">
+            AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[>=]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != '' ">
+            AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[<=]]> #{endTime}
+        </if>
+        <if test="isWeifare != null and isWeifare != '' ">
+            AND is_welfare = #{isWeifare}
+        </if>
+        <if test="moveInId != null and moveInId != '' ">
+            AND id = #{moveInId}
+        </if>
+        ORDER BY created_time DESC
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 1645f09bdf..2cb6a6fd09 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -2,6 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.IcResiUserDao">
+    <resultMap id="homeMemberList" type="com.epmet.dto.result.HouseIcResiUserResultDTO">
+
+    <result column="customer_id" property="customerId"/>
+    <result column="agency_id" property="agencyId"/>
+    <result column="grid_id" property="gridId"/>
+    <result column="village_id" property="villageId"/>
+    <result column="build_id" property="buildId"/>
+    <result column="unit_id" property="unitId"/>
+    <result column="home_id" property="homeId"/>
+    <collection property="houseMemberList" ofType="com.epmet.dto.result.HouseIcResiUserResultDTO$HouseMemberResultDTO">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="mobile" property="mobile"/>
+        <result column="gender" property="gender"/>
+        <result column="id_card" property="idCard"/>
+        <result column="birthday" property="birthday"/>
+        <result column="hjszd" property="hjszd"/>
+        <result column="yhzgx" property="yhzgx"/>
+        <result column="is_party" property="isParty"/>
+        <result column="is_tenant" property="isTenant"/>
+        <result column="is_floating" property="isFloating"/>
+        <result column="gzdw" property="gzdw"/>
+        <result column="mz" property="mz"/>
+        <result column="jg" property="jg"/>
+        <result column="hyzk" property="hyzk"/>
+        <result column="culture" property="culture"/>
+        <result column="faith" property="faith"/>
+        <result column="remarks" property="remarks"/>
+    </collection>
+    </resultMap>
 
     <insert id="add">
         insert into ${tableName}
@@ -363,19 +393,6 @@
             AND IC_RESI_USER = #{userId}
         </if>
     </select>
-    <select id="getResiUser" resultType="com.epmet.dto.IcResiUserDTO">
-        SELECT
-            id,
-            `name`,
-            id_card,
-            mobile
-        FROM
-            ic_resi_user
-        WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
-        AND id_card = #{idCard}
-    </select>
     <select id="getResiUserByIdCard" resultType="com.epmet.dto.IcResiUserDTO">
         SELECT
             id,
@@ -386,7 +403,8 @@
             ic_resi_user
         WHERE
             del_flag = '0'
-        AND id_card = #{idCard}
+            AND customer_id = #{customerId}
+            AND id_card = #{idCard}
     </select>
 
     <select id="selectDemandUsers" parameterType="map" resultType="com.epmet.dto.result.DemandUserResDTO">
@@ -394,7 +412,12 @@
         ir.id as demandUserId,
         IFNULL(ir.`NAME`,'') AS demandUserName,
         IFNULL(ir.MOBILE,'') AS demandUserMobile,
-        concat(ir.`NAME`,'(',ir.MOBILE,')')as label,
+        (
+            case when ir.MOBILE is not null and ir.MOBILE!=''
+            then concat(ir.`NAME`,'(',ir.MOBILE,')')
+            else ir.`NAME`
+            end
+        ) as label,
         ir.grid_id as gridId,
         ir.ID_CARD as idCard,
         ir.AGENCY_ID as agencyId,
@@ -923,5 +946,28 @@
         </choose>
         GROUP BY is_floating
     </select>
+    <select id="getResiUserGroupHomeId" resultMap="homeMemberList">
+        SELECT
+            HOME_ID,
+            ID,NAME,GENDER,MOBILE,ID_CARD,BIRTHDAY,HJSZD,YHZGX,IS_PARTY,IS_TENANT,IS_FLOATING,GZDW,MZ,JG,HYZK,CULTURE,FAITH,REMARKS
+        FROM  ic_resi_user
+        WHERE
+        CUSTOMER_ID = #{customerId}
+        <if test="pids != null and pids.trim() != ''">
+           and AGENCY_ID = #{agencyId} OR PIDS like CONCAT(#{pids}, '%')
+        </if>
+        <if test="gridId != null and gridId.trim() != ''">
+            and GRID_ID = #{gridId}
+        </if>
+        <if test="neighborHoodId != null and neighborHoodId.trim() != ''">
+            and VILLAGE_ID = #{neighborHoodId}
+        </if>
+         <if test="buildingId != null and buildingId.trim() != ''">
+            and BUILD_ID = #{neighborHoodId}
+        </if>
+         <if test="houseId != null and houseId.trim() != ''">
+            and HOME_ID = #{houseId}
+        </if>
+    </select>
 
 </mapper>