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,