From 956713f13d48cb60ac41d7de2e0fa66f036b045c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:35:34 +0800
Subject: [PATCH] Merge branch 'dev_New' into yhdq

---
 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