From 694030733daa2e8b2f90f526b4ecb1a230a89136 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 18 十月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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