From b14b677b6fc4b02dec84e160f9795eaf83670bde Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 2 Nov 2022 16:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/EmphasisTripListResultDTO.java    | 2 +-
 .../src/main/resources/mapper/IcTripReportRecordDao.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java
index 578709a489..f44bf4e952 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java
@@ -26,7 +26,7 @@ public class EmphasisTripListResultDTO implements Serializable {
     /**
      * 来曹事由
      */
-    private String describe;
+    private String describeContent;
 
     /**
      * 核酸检测结果
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index c752a0d8da..212ab88ca6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -78,7 +78,7 @@
             ID,
             AGENCY_ID,
             SOURCE_ADDRESS,
-            IFNULL(`describe`,'') as `describe`,
+            IFNULL(`describe_content`,'') as describeContent,
             ifnull(sojourn_history,'3') as sojournHistory,
             IFNULL(isolate_type,'4') as isolateType,
             ARRIVE_DATE,