From 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 09:56:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 86feed9..4b7553f 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -22,6 +22,12 @@
@Excel(name = "搴撳瓨鏁伴噺")
private BigDecimal qualitity;
+ @Excel(name = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
+ @Excel(name = "鍐荤粨鏁伴噺")
+ private BigDecimal lockedQuantity;
+
@Excel(name = "澶囨敞")
private String remark;
//
--
Gitblit v1.9.3