From 766089ad50ae807ab88ba83b2dbc4a53bda8e423 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十二月 2023 18:27:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index bcc63f7..98b82af 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -57,11 +57,11 @@
 
     @ApiModelProperty(value = "鏈夋晥鏈熷紑濮�")
     @ExcelColumn(name="鏈夋晥鏈熷紑濮�")
-    private String startTime;
+    private Date startTime;
 
     @ApiModelProperty(value = "鏈夋晥鏈熺粨鏉�", example = "1")
     @ExcelColumn(name="鏈夋晥鏈熺粨鏉�")
-    private Integer endTime;
+    private Date endTime;
 
     @ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
     @ExcelColumn(name="瀵煎叆鐘舵��")

--
Gitblit v1.9.3