From ec50e978f09d5ecf6fc2d3a8649df4fe9649d9f1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 05 九月 2025 10:47:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'

---
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java |    8 +++++++-
 1 files changed, 7 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..f353897 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -14,6 +14,9 @@
 @Data
 public class ProcurementRecordOutPageDto {
 
+    @Excel(name = "鍑哄簱缂栧彿")
+    private String code;
+
     private Integer id;
 
     /**
@@ -25,10 +28,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