From dc3a872dd2f2cfcddd3db4e722efa376705482ec Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 16:04:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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..0067da9 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -1,12 +1,9 @@
package com.ruoyi.device.execl;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
@Data
public class DeviceLedgerExeclDto {
@@ -65,13 +62,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