From 0100359605ba05638c1f683d68a2948cc273b0d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 08 十二月 2025 11:21:29 +0800
Subject: [PATCH] yys 修改设备模块
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 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..1335284 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;
@@ -40,38 +41,51 @@
* 鏁伴噺
*/
@Excel(name = "鏁伴噺",sort = 5)
- private BigDecimal number;
+ private Integer number;
/**
- * 鍚◣鍗曚环
+ * 璧勪骇鍘熷��
*/
- @Excel(name = "鍚◣鍗曚环",sort = 6)
+ @Excel(name = "璧勪骇鍘熷��",sort = 6)
private BigDecimal taxIncludingPriceUnit;
+//
+// /**
+// * 鍚◣鎬讳环
+// */
+// @Excel(name = "鍚◣鎬讳环",sort = 7)
+// private BigDecimal taxIncludingPriceTotal;
+//
+// /**
+// * 绋庣巼
+// */
+// @Excel(name = "绋庣巼",sort = 8)
+// private BigDecimal taxRate;
+
+// /**
+// * 涓嶅惈绋庢�讳环
+// */
+// @Excel(name = "涓嶅惈绋庢�讳环",sort = 9)
+// private BigDecimal unTaxIncludingPriceTotal;
+//
+// /**
+// * 褰曞叆鏃堕棿
+// *
+// */
+// @Excel(name = "褰曞叆鏃堕棿",sort = 10)
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime createTime;
/**
- * 鍚◣鎬讳环
+ * 鍗曚綅
*/
- @Excel(name = "鍚◣鎬讳环",sort = 7)
- private BigDecimal taxIncludingPriceTotal;
+ @Excel(name = "瀛樻斁鍦扮偣",sort = 7)
+ private String storageLocation;
/**
- * 绋庣巼
+ * 鍗曚綅
*/
- @Excel(name = "绋庣巼",sort = 8)
- private BigDecimal taxRate;
-
- /**
- * 涓嶅惈绋庢�讳环
- */
- @Excel(name = "涓嶅惈绋庢�讳环",sort = 9)
- private BigDecimal unTaxIncludingPriceTotal;
-
- /**
- * 褰曞叆鏃堕棿
- *
- */
- @Excel(name = "褰曞叆鏃堕棿",sort = 10)
- private LocalDateTime createTime;
+ @Excel(name = "璁惧鍝佺墝",sort = 8)
+ private String deviceBrand;
--
Gitblit v1.9.3