From 610bfdf7b4feddb8285a7047e1ca49fd8e6e4580 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Mon, 7 Nov 2022 17:55:18 +0800
Subject: [PATCH] .

---
 .../IcPsTripReportRecordExportExcel.java      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

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..fd9c52e04a 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
@@ -23,128 +23,128 @@ public class IcPsTripReportRecordExportExcel implements Serializable {
      * 姓名
      */
     @ColumnWidth(12)
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "姓名", order = 1)
 	private String name;
     /**
      * 证件号
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "证件号")
+    @ExcelProperty(value = "证件号", order = 2)
     private String idCard;
     /**
      * 户籍地 【磐石】
      */
     @ColumnWidth(28)
-    @ExcelProperty(value = "户籍地（省市县区）")
+    @ExcelProperty(value = "户籍地（省市县区）", order = 3)
     private String registeredResidence;
     /**
      * 手机号
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "手机号")
+    @ExcelProperty(value = "手机号", order = 4)
 	private String mobile;
     /**
      * 来自地区（格式：省-市-区-街道-社区）
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 6)
+    @ExcelProperty(value = "来自地区（格式：省-市-区-街道-社区）",order = 5)
     private String sourceAddress;
     /**
      * 来自地区详细地址 source_address字段的说明
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "来自地区详细地址",order = 7)
+    @ExcelProperty(value = "来自地区详细地址",order = 6)
     private String sourceDetailAddress;
     /**
      * 来曹事由（100字以内）【磐石】
      */
     @ColumnWidth(25)
-    @ExcelProperty(value = "来曹事由（100字以内）",order = 8)
+    @ExcelProperty(value = "来曹事由（100字以内）",order = 7)
     private String describeContent;
     /**
      * 48小时核酸检测 0:阴性 1:阳性 -中国字
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "48小时核酸检测",order = 9)
+    @ExcelProperty(value = "48小时核酸检测",order = 8)
     private String isNatRecordName;
     /**
      * 来到本地时间（2022-01-01）
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 10)
+    @ExcelProperty(value = "来到本地时间（2022-01-01）",order = 9)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private String arriveDate;
     /**
      * 现居地
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "现居地",order = 11)
+    @ExcelProperty(value = "现居地",order = 10)
 	private String presentAddress;
     /**
      * 现居地详细地址
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "现居地详细地址",order = 12)
+    @ExcelProperty(value = "现居地详细地址",order = 11)
 	private String detailAddress;
     /**
      * 交通方式-中国字
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "返回方式",order = 13)
+    @ExcelProperty(value = "返回方式",order = 12)
     private String trafficTypeName;
     /**
      * 其他返回方式，交通方式为其他时此列需要有值
      */
     @ColumnWidth(18)
-    @ExcelProperty(value = "其他返回方式",order = 14)
+    @ExcelProperty(value = "其他返回方式",order = 13)
     private String trafficTypeExplain;
     /**
      * 7天内旅居史情况，字典表(sojourn_history)【磐石】-中国字
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "7天内旅居史情况",order = 15)
+    @ExcelProperty(value = "7天内旅居史情况",order = 14)
     private String sojournHistoryName;
     /**
      * 隔离状态，字典表(isolate_type)【磐石】-中国字
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "隔离状态",order = 16)
+    @ExcelProperty(value = "隔离状态",order = 17)
     private String isolateTypeName;
     /**
      * 备注（500字以内）
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "备注（500字以内）",order = 17)
+    @ExcelProperty(value = "备注（500字以内）",order = 16)
     private String remark;
     /**
      * 是否落实"落地检" 0:否 1:是【磐石】-中国字
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "是否落实“落地检”",order = 18)
+    @ExcelProperty(value = "是否落实“落地检”",order = 17)
     private String isArriveCheckName;
     /**
      * 是否达到曹县 0:否 1:是【磐石】-中国字
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "是否达到曹县",order = 19)
+    @ExcelProperty(value = "是否达到曹县",order = 18)
     private String isArriveName;
     /**
      * 上报时间（2022-01-01）【磐石】
      */
     @ColumnWidth(20)
-    @ExcelProperty(value = "上报时间（2022-01-01）",order = 20)
+    @ExcelProperty(value = "上报时间（2022-01-01）",order = 19)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private String reportingTime;
     /**
      * 管控措施（500字以内）【磐石】
      */
     @ColumnWidth(30)
-    @ExcelProperty(value = "管控措施（500字以内）",order = 21)
+    @ExcelProperty(value = "管控措施（500字以内）",order = 20)
     private String controlMeasures;
     /**
      * 类型（省内、省外、市内、县内），字典表(trip_data_type)【磐石】-中国字
      */
     @ColumnWidth(25)
-    @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 22)
+    @ExcelProperty(value = "类型（省内、省外、市内、县内）",order = 21)
     private String tripDataTypeName;
 }