diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java index 5ac7eec..02ea78e 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java @@ -66,7 +66,7 @@ public class TripReportEntity extends BaseEpdcEntity { /** * 现居住详细地址 */ - private String nowAddressDaetail; + private String nowAddressDetail; /** * 来自地区编码 diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java index 0f24459..9ffa418 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java @@ -50,7 +50,7 @@ public class TripReportExcel { private String nowAddressName; @Excel(name = "现居住详细地址") - private String nowAddressDaetail; + private String nowAddressDetail; @Excel(name = "来自地区编码") private String comeAddressCode; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java index ba57674..4d84a13 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java @@ -110,6 +110,7 @@ public class TripReportServiceImpl extends BaseServiceImpl result = baseDao.getTripInfoList(formDto); @@ -125,12 +127,14 @@ public class TripReportServiceImpl extends BaseServiceImpl - +