diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 4410c61293..c0841b4a29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("来曹事由(100字以内)") + @ExcelProperty("在曹事由(100字以内)") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 73af0b78d0..bfdd634a1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 来曹事由(100字以内)【磐石】 + * 在曹事由(100字以内)【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由(100字以内)",order = 8) + @ExcelProperty(value = "在曹事由(100字以内)",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index c5a91432ad..6b325c4fe8 100644 Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx and b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx differ