diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
index 68b496a..20d799a 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
@@ -4,11 +4,6 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@@ -20,26 +15,32 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
-import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
-import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.service.PropertyService;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.group.form.GroupBySectionFormDTO;
+import com.elink.esua.epdc.smile.dto.group.result.GroupBySectionResultDTO;
+import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java
index a7f2ef7..99dfc63 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java
@@ -2,16 +2,16 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.service.WorkPropertyService;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateHistoryFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateHistoryResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyUnansweredResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
index 506149b..0d25d1a 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
@@ -2,11 +2,6 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@@ -14,23 +9,8 @@ import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
-import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
-import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -38,6 +18,27 @@ import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.feign.fallback.PropertyFeignClientFallback;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.group.form.GroupBySectionFormDTO;
+import com.elink.esua.epdc.smile.dto.group.result.GroupBySectionResultDTO;
+import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java
index 1821d8e..95a5eb7 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java
@@ -3,16 +3,16 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.fallback.WorkPropertyFeignClientFallback;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateHistoryFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateHistoryResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyUnansweredResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
index ec2da4d..d5c9285 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
@@ -3,11 +3,6 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@@ -15,23 +10,8 @@ import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
-import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
-import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -39,6 +19,27 @@ import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
 import com.elink.esua.epdc.feign.PropertyFeignClient;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.group.form.GroupBySectionFormDTO;
+import com.elink.esua.epdc.smile.dto.group.result.GroupBySectionResultDTO;
+import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java
index 609ce1d..ccc074b 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java
@@ -3,16 +3,16 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.WorkPropertyFeignClient;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateHistoryFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateHistoryResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyUnansweredResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
index b34d98d..6ec9622 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
@@ -3,11 +3,6 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@@ -19,27 +14,33 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
-import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
-import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.group.form.GroupBySectionFormDTO;
+import com.elink.esua.epdc.smile.dto.group.result.GroupBySectionResultDTO;
+import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 
 import java.util.List;
 
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java
index 3769c14..1ff1ecf 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java
@@ -1,15 +1,15 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateHistoryFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateHistoryResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyUnansweredResultDTO;
 
 import java.util.List;
 
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
index 91d424d..0a23120 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
@@ -6,11 +6,6 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
-import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
-import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@@ -23,23 +18,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
-import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
-import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
-import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
-import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -51,6 +31,27 @@ import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.news.feign.NewsFeignClient;
 import com.elink.esua.epdc.feign.PropertyFeignClient;
 import com.elink.esua.epdc.service.PropertyService;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.group.form.GroupBySectionFormDTO;
+import com.elink.esua.epdc.smile.dto.group.result.GroupBySectionResultDTO;
+import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
+import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.utils.UserTagUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java
index 832a613..24142fb 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java
@@ -3,17 +3,17 @@ package com.elink.esua.epdc.service.impl;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
-import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO;
-import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.WorkPropertyFeignClient;
 import com.elink.esua.epdc.service.WorkPropertyService;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.form.ConflictMediateHistoryFormDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateDetailResultDTO;
+import com.elink.esua.epdc.smile.dto.conflict.result.ConflictMediateHistoryResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
+import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyUnansweredResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;