diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index 905eb1e..a969c3f 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -2,9 +2,9 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO;
-import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO;
-import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptCodeFormDTO;
import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
index 0691bd9..e235f7e 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -3,9 +3,9 @@ package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO;
-import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO;
-import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptCodeFormDTO;
import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
import org.springframework.stereotype.Component;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptAddAreaCodeFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptAddAreaCodeFormDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptAddAreaCodeFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptAddAreaCodeFormDTO.java
index 53dcf1a..55495bd 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptAddAreaCodeFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptAddAreaCodeFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.admin;
+package com.elink.esua.epdc.dto.analysis.pc.admin;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptAddAreaCodeResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptAddAreaCodeResultDTO.java
similarity index 84%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptAddAreaCodeResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptAddAreaCodeResultDTO.java
index 91dba9d..5cffe66 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptAddAreaCodeResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptAddAreaCodeResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.admin;
+package com.elink.esua.epdc.dto.analysis.pc.admin;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptCodeFormDTO.java
similarity index 87%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptCodeFormDTO.java
index 48a5e98..0123387 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptCodeFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.admin;
+package com.elink.esua.epdc.dto.analysis.pc.admin;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptCodeTree.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptCodeTree.java
index bf51fdd..fa99c2d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/DeptCodeTree.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.admin;
+package com.elink.esua.epdc.dto.analysis.pc.admin;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/SysEpmetUserFormDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/SysEpmetUserFormDTO.java
index 89de94e..9206179 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/SysEpmetUserFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.admin;
+package com.elink.esua.epdc.dto.analysis.pc.admin;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/SysEpmetUserResultDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/SysEpmetUserResultDTO.java
index 900a74e..f5038a2 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/admin/SysEpmetUserResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.admin;
+package com.elink.esua.epdc.dto.analysis.pc.admin;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeTree.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/CategoryCodeTree.java
similarity index 89%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeTree.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/CategoryCodeTree.java
index d21f474..d3b6d46 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeTree.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/CategoryCodeTree.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.category;
+package com.elink.esua.epdc.dto.analysis.pc.category;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeUpload.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/CategoryCodeUpload.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeUpload.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/CategoryCodeUpload.java
index fceafa6..0a9aa62 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeUpload.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/CategoryCodeUpload.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.category;
+package com.elink.esua.epdc.dto.analysis.pc.category;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/EpmetCategoryCodeOption.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/EpmetCategoryCodeOption.java
similarity index 79%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/EpmetCategoryCodeOption.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/EpmetCategoryCodeOption.java
index f0f97b4..f9fe487 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/category/EpmetCategoryCodeOption.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/category/EpmetCategoryCodeOption.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.category;
+package com.elink.esua.epdc.dto.analysis.pc.category;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/HotIssueFormDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/HotIssueFormDTO.java
index 2a9e87e..beb1fb9 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/HotIssueFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.form;
+package com.elink.esua.epdc.dto.analysis.pc.issue.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/IssueStatisticsInfoFormDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/IssueStatisticsInfoFormDTO.java
index c933960..b6bf214 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/IssueStatisticsInfoFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.form;
+package com.elink.esua.epdc.dto.analysis.pc.issue.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/NewIssueFormDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/NewIssueFormDTO.java
index 20b8575..94efa79 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/form/NewIssueFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.form;
+package com.elink.esua.epdc.dto.analysis.pc.issue.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/HotIssueResultDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/HotIssueResultDTO.java
index 881ad9b..53abf43 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/HotIssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.result;
+package com.elink.esua.epdc.dto.analysis.pc.issue.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueClassifiedStatisticDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueClassifiedStatisticDTO.java
index bbb8977..2137965 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueClassifiedStatisticDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.result;
+package com.elink.esua.epdc.dto.analysis.pc.issue.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueResultDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueResultDTO.java
index b3b3897..c455bd8 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.result;
+package com.elink.esua.epdc.dto.analysis.pc.issue.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueStatisticsInfoResultDTO.java
similarity index 85%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueStatisticsInfoResultDTO.java
index edb29ad..5cf2fe5 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/IssueStatisticsInfoResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.result;
+package com.elink.esua.epdc.dto.analysis.pc.issue.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/NewIssueResultDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/NewIssueResultDTO.java
index 94c11fe..ce83200 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/issue/result/NewIssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.issue.result;
+package com.elink.esua.epdc.dto.analysis.pc.issue.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/HotItemListFormDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/HotItemListFormDTO.java
index d2bed54..07d9741 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/HotItemListFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.form;
+package com.elink.esua.epdc.dto.analysis.pc.item.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/ItemAnalysisFormDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/ItemAnalysisFormDTO.java
index 2dc00a6..dea210c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/ItemAnalysisFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.form;
+package com.elink.esua.epdc.dto.analysis.pc.item.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/ItemSurveyFormDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/ItemSurveyFormDTO.java
index 81a77b4..ba7bc1e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/form/ItemSurveyFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.form;
+package com.elink.esua.epdc.dto.analysis.pc.item.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/CategoryGridDailyResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/CategoryGridDailyResultDTO.java
index 46bd078..4989702 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/CategoryGridDailyResultDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/CategoryOrgDailyResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/CategoryOrgDailyResultDTO.java
index b7f866a..1cb9b6b 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/CategoryOrgDailyResultDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java
index 5294817..8d91b39 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/HotItemListResultDTO.java
similarity index 87%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/HotItemListResultDTO.java
index db165f0..02062d1 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/HotItemListResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemAnalysisResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemAnalysisResultDTO.java
index 4db3b34..5c7c017 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemAnalysisResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemResultDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemResultDTO.java
index 6e938d0..1e230d7 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemSurveyResultDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemSurveyResultDTO.java
index 661cf82..f95b803 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ItemSurveyResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ReportSolvedItemResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ReportSolvedItemResultDTO.java
index 978df82..d047b42 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ReportSolvedItemResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ReportUnsolvedItemResultDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ReportUnsolvedItemResultDTO.java
index ed0119d..46234f9 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/ReportUnsolvedItemResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/UnsolvedItemResultDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/UnsolvedItemResultDTO.java
index 14fd2ef..9b236be 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/UnsolvedItemResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.item.result;
+package com.elink.esua.epdc.dto.analysis.pc.item.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenJobFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/ScreenJobFormDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenJobFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/ScreenJobFormDTO.java
index 353168b..eb64546 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenJobFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/ScreenJobFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.form;
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenProjectFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/ScreenProjectFormDTO.java
similarity index 87%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenProjectFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/ScreenProjectFormDTO.java
index 5484c5d..680c16c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenProjectFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/ScreenProjectFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.form;
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/Attachments.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/Attachments.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/Attachments.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/Attachments.java
index 9fea207..b5c8026 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/Attachments.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/Attachments.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityGroupTotalResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityGroupTotalResultDTO.java
index 5c9b12a..b7eb528 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityGroupTotalResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityProjectResultDTO.java
similarity index 98%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityProjectResultDTO.java
index 99f9a7a..f420301 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityProjectResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityTopicIssueResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityTopicIssueResultDTO.java
index c8fb13c..fc5d2f3 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityTopicIssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityTopicStatusResultDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityTopicStatusResultDTO.java
index 8555585..f266247 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CommunityTopicStatusResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CpcbasedataDTO.java
similarity index 89%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CpcbasedataDTO.java
index fc5e526..b84fb61 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CpcbasedataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CpcbasedataResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CpcbasedataResultDTO.java
index d860d88..3a78b66 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/CpcbasedataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DeptGovrnAbilityDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DeptGovrnAbilityDTO.java
index a367d05..d91b4cc 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DeptGovrnAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DifficultyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DifficultyResultDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DifficultyResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DifficultyResultDTO.java
index 7bbcdc2..50c8d65 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DifficultyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DifficultyResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DifficultydataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DifficultydataResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DifficultydataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DifficultydataResultDTO.java
index b14e163..aa9f04d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DifficultydataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/DifficultydataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GovernrankdataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GovernrankdataDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GovernrankdataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GovernrankdataDTO.java
index ab3aa46..81a73ee 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GovernrankdataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GovernrankdataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GovernrankdataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GovernrankdataResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GovernrankdataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GovernrankdataResultDTO.java
index ed68e78..2bff312 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GovernrankdataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GovernrankdataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGovrnAbilityDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGovrnAbilityDTO.java
index cf6462d..dfbc065 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGovrnAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGridProjectResultDTO.java
similarity index 98%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGridProjectResultDTO.java
index 61b290b..c0b9669 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGridProjectResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGroupTotalResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGroupTotalResultDTO.java
index fc883b8..49661cb 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridGroupTotalResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridManagerUploadDataResultDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridManagerUploadDataResultDTO.java
index dcba465..f86519d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridManagerUploadDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridManagerUploadEventResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridManagerUploadEventResultDTO.java
index 902b67b..baa30e7 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridManagerUploadEventResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridPartyAbilityDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridPartyAbilityDTO.java
index a032282..80d1a2a 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridPartyAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyMemberDataDetailDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridPartyMemberDataDetailDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyMemberDataDetailDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridPartyMemberDataDetailDTO.java
index 06cd0a5..b78431b 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyMemberDataDetailDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridPartyMemberDataDetailDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridServiceAbilityDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridServiceAbilityDTO.java
index 00a8152..03e95f8 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridServiceAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridTopicIssueResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridTopicIssueResultDTO.java
index f82a6e1..350ae0e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridTopicIssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridTopicStatusResultDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridTopicStatusResultDTO.java
index ba6b81e..61ab079 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/GridTopicStatusResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/HomePagePlatformSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/HomePagePlatformSummaryDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/HomePagePlatformSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/HomePagePlatformSummaryDTO.java
index e2ecb68..79227c0 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/HomePagePlatformSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/HomePagePlatformSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgGovrnAbilityDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgGovrnAbilityDTO.java
index 26a457b..f995661 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgGovrnAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgPartyAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgPartyAbilityDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgPartyAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgPartyAbilityDTO.java
index 9fac9a9..6995a78 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgPartyAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgPartyAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgServiceAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgServiceAbilityDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgServiceAbilityDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgServiceAbilityDTO.java
index b171e73..25e0aa0 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgServiceAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgServiceAbilityDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgrankdataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgrankdataDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgrankdataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgrankdataDTO.java
index ab8770d..610185b 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgrankdataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgrankdataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgrankdataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgrankdataResultDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgrankdataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgrankdataResultDTO.java
index 7f6ff30..815b5fe 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgrankdataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/OrgrankdataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartylinkmassesdataDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartylinkmassesdataDTO.java
index d0314a3..ad1722e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartylinkmassesdataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartylinkmassesdataResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartylinkmassesdataResultDTO.java
index f129712..50e1c52 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartylinkmassesdataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartyuserrankdataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartyuserrankdataDTO.java
similarity index 89%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartyuserrankdataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartyuserrankdataDTO.java
index 043aa26..16a0a84 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartyuserrankdataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartyuserrankdataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartyuserrankdataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartyuserrankdataResultDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartyuserrankdataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartyuserrankdataResultDTO.java
index bf433c1..f522977 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartyuserrankdataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PartyuserrankdataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PioneerdataDTO.java
similarity index 89%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PioneerdataDTO.java
index cb45867..9667542 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PioneerdataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PioneerdataResultDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PioneerdataResultDTO.java
index 0c12565..613c0f2 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PioneerdataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ProjectGridDailyDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ProjectGridDailyDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ProjectGridDailyDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ProjectGridDailyDTO.java
index 49d8201..17d4415 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ProjectGridDailyDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ProjectGridDailyDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ProjectOrgDailyDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ProjectOrgDailyDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ProjectOrgDailyDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ProjectOrgDailyDTO.java
index 774ef61..8e6718b 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ProjectOrgDailyDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ProjectOrgDailyDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PublicpartitotaldataDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PublicpartitotaldataDTO.java
index cc13a97..8d484ff 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PublicpartitotaldataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PublicpartitotaldataResultDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PublicpartitotaldataResultDTO.java
index 64303dc..23b3e47 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/PublicpartitotaldataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/QuantityGridMonthly.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/QuantityGridMonthly.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/QuantityGridMonthly.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/QuantityGridMonthly.java
index 0307631..18c8e4d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/QuantityGridMonthly.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/QuantityGridMonthly.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/QuantityOrgMonthlyDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/QuantityOrgMonthlyDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/QuantityOrgMonthlyDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/QuantityOrgMonthlyDTO.java
index 147e7c8..c24953d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/QuantityOrgMonthlyDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/QuantityOrgMonthlyDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenActSummaryDTO.java
similarity index 91%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenActSummaryDTO.java
index 7ea2866..5888f13 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenActSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActVolunteerSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenActVolunteerSummaryDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActVolunteerSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenActVolunteerSummaryDTO.java
index 0b4b8e8..8cdc11c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActVolunteerSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenActVolunteerSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyHotTopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyHotTopicResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyHotTopicResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyHotTopicResultDTO.java
index fd93c65..f0f167f 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyHotTopicResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyHotTopicResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyIssueResultDTO.java
similarity index 98%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyIssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyIssueResultDTO.java
index 0d93a71..a02454b 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyIssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyIssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyRegUserResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyRegUserResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyRegUserResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyRegUserResultDTO.java
index 847aef8..f02985c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyRegUserResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyRegUserResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBaseReportResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenBaseReportResultDTO.java
similarity index 80%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBaseReportResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenBaseReportResultDTO.java
index 2fb1d5c..657c08d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBaseReportResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenBaseReportResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBasicDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenBasicDataResultDTO.java
similarity index 81%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBasicDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenBasicDataResultDTO.java
index ccb2dbf..a4a6407 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBasicDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenBasicDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCategoryDateDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCategoryDateDTO.java
index 69928ce..3663db9 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCategoryDateDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerAgencyDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerAgencyDTO.java
index 84cd391..3dbf4c1 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerAgencyDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerDeptDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerDeptDTO.java
index 2b08c87..32f13c1 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerDeptDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerGridDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerGridDTO.java
index f9274b7..60a3d68 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenCustomerGridDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataDTO.java
similarity index 87%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataDTO.java
index 1e1fdf6..e26d78a 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDateDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataDateDTO.java
similarity index 91%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDateDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataDateDTO.java
index 3f618e5..9aa479f 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDateDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataDateDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataMonthDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataMonthDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataMonthDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataMonthDTO.java
index 11d070a..aec7ed0 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataMonthDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenDataMonthDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridHotTopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridHotTopicResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridHotTopicResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridHotTopicResultDTO.java
index d233771..ebe4d1e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridHotTopicResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridHotTopicResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridIssueResultDTO.java
similarity index 98%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridIssueResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridIssueResultDTO.java
index b46235c..4f01cf0 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridIssueResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridIssueResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridRegUserResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridRegUserResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridRegUserResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridRegUserResultDTO.java
index 62fad03..125c071 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridRegUserResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridRegUserResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupDetailDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupDetailDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupDetailDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupDetailDTO.java
index 1b887a0..a4464f0 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupDetailDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupDetailDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupSummaryDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupSummaryDTO.java
index 7e2487c..25758cc 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupTopicTrendDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupTopicTrendDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupTopicTrendDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupTopicTrendDTO.java
index de3c908..793cc24 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupTopicTrendDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGroupTopicTrendDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIndexDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIndexDataResultDTO.java
similarity index 81%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIndexDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIndexDataResultDTO.java
index f72b98e..63d0e8e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIndexDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIndexDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIssueSummaryDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIssueSummaryDTO.java
index d759af4..2bbd26f 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIssueSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueTrendDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIssueTrendDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueTrendDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIssueTrendDTO.java
index 21b2c59..9d03a3c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueTrendDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenIssueTrendDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsCategoryAnalysisDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsCategoryAnalysisDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsCategoryAnalysisDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsCategoryAnalysisDTO.java
index e0f760b..1d57004 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsCategoryAnalysisDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsCategoryAnalysisDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsHotRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsHotRankDTO.java
similarity index 89%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsHotRankDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsHotRankDTO.java
index 65dd41a..1a0f0bc 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsHotRankDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsHotRankDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsSummaryDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsSummaryDTO.java
index a29d1fc..113dbde 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenNewsSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPartyUserRankDataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenPartyUserRankDataDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPartyUserRankDataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenPartyUserRankDataDTO.java
index 920fb59..37dc602 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPartyUserRankDataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenPartyUserRankDataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectCategorySummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectCategorySummaryDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectCategorySummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectCategorySummaryDTO.java
index 820647b..5a2be50 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectCategorySummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectCategorySummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectDataResultDTO.java
similarity index 81%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectDataResultDTO.java
index 71e7ae5..9a73987 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectStatisticAnalysisDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectStatisticAnalysisDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectStatisticAnalysisDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectStatisticAnalysisDTO.java
index aa0bdb0..836f1d8 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectStatisticAnalysisDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectStatisticAnalysisDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectSummaryDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectSummaryDTO.java
index cfe8bb5..afeaf47 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenProjectSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPublicDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenPublicDataResultDTO.java
similarity index 81%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPublicDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenPublicDataResultDTO.java
index 6b45f82..9e51eb5 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPublicDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenPublicDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserSummaryDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenUserSummaryDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserSummaryDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenUserSummaryDTO.java
index 177c915..e5b8c69 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenUserSummaryDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserUserHeartRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenUserUserHeartRankDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserUserHeartRankDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenUserUserHeartRankDTO.java
index 7dcd8db..85652cc 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserUserHeartRankDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenUserUserHeartRankDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenVolunteerHeartRank.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenVolunteerHeartRank.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenVolunteerHeartRank.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenVolunteerHeartRank.java
index 95c18aa..7967fff 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenVolunteerHeartRank.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenVolunteerHeartRank.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UploadProjectInfoDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UploadProjectInfoDTO.java
index 4183310..169df75 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UploadProjectInfoDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectProcessDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UploadProjectProcessDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectProcessDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UploadProjectProcessDTO.java
index 87114f6..a6bd482 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectProcessDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UploadProjectProcessDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UserjoinDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UserjoinDTO.java
index 8345a49..af1f8c5 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UserjoinDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UserjoinResultDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UserjoinResultDTO.java
index add1cbb..0275896 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UserjoinResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UsertotaldataDTO.java
similarity index 89%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UsertotaldataDTO.java
index 34cf710..ce145d3 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UsertotaldataDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UsertotaldataResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UsertotaldataResultDTO.java
index d565d38..bae0cac 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/UsertotaldataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.screen.result;
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/form/HotTopicFormDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/form/HotTopicFormDTO.java
index ce99483..300861e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/form/HotTopicFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.topic.form;
+package com.elink.esua.epdc.dto.analysis.pc.topic.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/form/NewHotTopicFormDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/form/NewHotTopicFormDTO.java
index 60d77af..7ce382f 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/form/NewHotTopicFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.topic.form;
+package com.elink.esua.epdc.dto.analysis.pc.topic.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/HotTopicResultDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/HotTopicResultDTO.java
index 71fba9e..e920612 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/HotTopicResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.topic.result;
+package com.elink.esua.epdc.dto.analysis.pc.topic.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/NewHotTopicResultDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/NewHotTopicResultDTO.java
index 90107f2..27f4420 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/NewHotTopicResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.topic.result;
+package com.elink.esua.epdc.dto.analysis.pc.topic.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/TopicResultDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/TopicResultDTO.java
index 17c9f46..543edf4 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/topic/result/TopicResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.topic.result;
+package com.elink.esua.epdc.dto.analysis.pc.topic.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserGridOpiningDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserGridOpiningDTO.java
index c3b3d37..baf1d69 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserGridOpiningDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.analysis.pc.user;
import java.io.Serializable;
import java.util.Date;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserPartyRankDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserPartyRankDTO.java
index be8c514..b190da8 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserPartyRankDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.analysis.pc.user;
import java.io.Serializable;
import java.util.Date;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserRegisterRankDTO.java
similarity index 97%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserRegisterRankDTO.java
index 52f3b71..337cbae 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/MetaUserRegisterRankDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.analysis.pc.user;
import java.io.Serializable;
import java.util.Date;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/UserAnalysisDTO.java
similarity index 75%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/UserAnalysisDTO.java
index 8641b88..e47e09d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/UserAnalysisDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.analysis.pc.user;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/ExportOperationFormDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/ExportOperationFormDTO.java
index f8ebbe5..899ffd4 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/ExportOperationFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.form;
+package com.elink.esua.epdc.dto.analysis.pc.user.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/MemberRankFormDTO.java
similarity index 93%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/MemberRankFormDTO.java
index 9509ffb..922e787 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/MemberRankFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.form;
+package com.elink.esua.epdc.dto.analysis.pc.user.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserCountDTO.java
similarity index 82%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserCountDTO.java
index f47fd38..6251a56 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserCountDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.form;
+package com.elink.esua.epdc.dto.analysis.pc.user.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserRegisterDataFormDTO.java
similarity index 74%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserRegisterDataFormDTO.java
index 4238927..3934231 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserRegisterDataFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.form;
+package com.elink.esua.epdc.dto.analysis.pc.user.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserSortRankFormDTO.java
similarity index 94%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserSortRankFormDTO.java
index ac299bb..c95ab03 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/form/UserSortRankFormDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.form;
+package com.elink.esua.epdc.dto.analysis.pc.user.form;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/ExportOperationDataResultDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/ExportOperationDataResultDTO.java
index 3762374..c7440d3 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/ExportOperationDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridDataTotalResultDTO.java
similarity index 86%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridDataTotalResultDTO.java
index be71415..e19d1a6 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridDataTotalResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridOpeningResultDTO.java
similarity index 96%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridOpeningResultDTO.java
index ca89f0e..894f6fc 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridOpeningResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GriddingCountDTO.java
similarity index 88%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GriddingCountDTO.java
index 6d3e677..65b8785 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GriddingCountDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/OldMemberRankResultDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/OldMemberRankResultDTO.java
index f10d6d8..dc5402c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/OldMemberRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserAnalysisCountDTO.java
similarity index 92%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserAnalysisCountDTO.java
index a258488..b34475d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserAnalysisCountDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserDataRankResultDTO.java
similarity index 95%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserDataRankResultDTO.java
index a725e5c..9961711 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserDataRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserRegisterDataResultDTO.java
similarity index 74%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserRegisterDataResultDTO.java
index 1ef2d33..e1976a9 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserRegisterDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserSortRankResultDTO.java
similarity index 91%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserSortRankResultDTO.java
index 3fbdb13..4835e5c 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/UserSortRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/YoungMemberRankResultDTO.java
similarity index 90%
rename from epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java
rename to epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/YoungMemberRankResultDTO.java
index ec567d6..a4b992d 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/YoungMemberRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.user.result;
+package com.elink.esua.epdc.dto.analysis.pc.user.result;
import lombok.Data;