From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 4b7553f..a2b5547 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -22,12 +22,12 @@
@Excel(name = "搴撳瓨鏁伴噺")
private BigDecimal qualitity;
- @Excel(name = "棰勮鏁伴噺")
- private BigDecimal warnNum;
-
@Excel(name = "鍐荤粨鏁伴噺")
private BigDecimal lockedQuantity;
+ @Excel(name = "鍑�閲�(鍚�)")
+ private BigDecimal netWeight;
+
@Excel(name = "澶囨敞")
private String remark;
//
--
Gitblit v1.9.3