From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
index 975acfa..b9fbc17 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.Date;
@Data
@ExcelAutoColumnSize
@@ -135,7 +136,7 @@
@Excel(name = "棰勮閫佽揪鏃堕棿")
@ApiModelProperty("棰勮閫佽揪鏃堕棿")
@ExcelComment(value = "arrTime", example = "2025-05-21")
- private String arrTime;
+ private Date arrTime;
@Excel(name = "澶囨敞")
--
Gitblit v1.9.1