From c6d20c6e1db82b204cf59e058bc3ba2a9cd84a1e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 09:24:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

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

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
index 5abe37d..91c04df 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
@@ -77,7 +77,7 @@
 
     @ApiModelProperty(value = "浜ゆ槗瀹屾垚鏃堕棿")
     @ExcelColumn(name="浜ゆ槗瀹屾垚鏃堕棿")
-    private String doneDate;
+    private Date doneDate;
 
     @ApiModelProperty(value = "浜ゆ槗鏍囬")
     @ExcelColumn(name="浜ゆ槗鏍囬")

--
Gitblit v1.9.3