From 064edafb567a6f7fc181535b48cf70341a5854ce Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 16:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0moduleType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java  | 2 ++
 .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
index 8c2b7b4ebe..e532068afa 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java
@@ -62,5 +62,7 @@ public class AnalysisReportResDTO implements Serializable {
      */
     @JsonIgnore
     private String expand;
+
+    private String moduleType;
 }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index dde753c53f..cfcd370980 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -27,7 +27,8 @@
             i.show_label,
             i.required,
             i.sort,
-            i.expand
+            i.expand,
+            module_type
         from pr_user_project_item  i
         where i.del_flag='0'
           and i.project_key=#{projectKey}