From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期六, 12 七月 2025 10:27:06 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly --- src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java index b0d8cad..3dd180e 100644 --- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java +++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java @@ -25,9 +25,12 @@ /** * 鍑哄叆搴撴椂闂� */ - @Excel(name = "鍑哄簱鏃堕棿") +// @Excel(name = "鍑哄簱鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime createDate; + private LocalDateTime createTime; + + @Excel(name = "鍑哄簱鏃堕棿") + private String time; /** * 鍑哄叆搴撶敤鎴� -- Gitblit v1.9.3