From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java
index 1e27745..0fd8595 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java
@@ -17,18 +17,17 @@
 @ApiModel("娌硅�椾俊鎭鍏�")
 public class PlatformGasImport {
 
+    @ExcelColumn(name="搴忓彿",value = "sn",index = 1)
+    private String sn;
+
     @ExcelColumn(name="杞︾墝鍙�",value = "carCode",index = 1)
     private String carCode;
 
-    @ExcelColumn(name="鏃堕棿锛堝勾鏈堬級",value = "timeInfo",index = 2,dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date timeInfo;
+    @ExcelColumn(name="浣跨敤鏈堜唤",value = "timeInfo",index = 2)
+    private String timeInfo;
 
-    @ExcelColumn(name="鏁伴噺",value = "num",index = 3)
+    @ExcelColumn(name="娌硅��(鍗�)",value = "num",index = 3)
     private String num;
-
-    @ExcelColumn(name="璇存槑",value = "content",index = 3)
-    private String content;
-
 
 
 }

--
Gitblit v1.9.3