From 9ea2e9763d84581ac3b2040c27cf30f0d53468da Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 15:07:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index 62fd6f7..3dd180e 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -25,10 +25,13 @@
/**
* 鍑哄叆搴撴椂闂�
*/
- @Excel(name = "鍑哄簱鏃堕棿")
+// @Excel(name = "鍑哄簱鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
+ @Excel(name = "鍑哄簱鏃堕棿")
+ private String time;
+
/**
* 鍑哄叆搴撶敤鎴�
*/
--
Gitblit v1.9.3