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/device/execl/DeviceLedgerExeclDto.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
index 576bef0..09c5f40 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -65,13 +66,14 @@
*/
@Excel(name = "涓嶅惈绋庢�讳环",sort = 9)
private BigDecimal unTaxIncludingPriceTotal;
-
- /**
- * 褰曞叆鏃堕棿
- *
- */
- @Excel(name = "褰曞叆鏃堕棿",sort = 10)
- private LocalDateTime createTime;
+//
+// /**
+// * 褰曞叆鏃堕棿
+// *
+// */
+// @Excel(name = "褰曞叆鏃堕棿",sort = 10)
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime createTime;
--
Gitblit v1.9.3