From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
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 08bf4f2..06efa6f 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -25,8 +25,14 @@
@Excel(name = "涓诲崟浣�")
private String unit;
+ @Excel(name = "杈呭崟浣�")
+ private String subUnit;
+
@Excel(name = "鏁伴噺(涓诲崟浣�)")
private BigDecimal qualitity;
+
+ @Excel(name = "鏁伴噺(杈呭崟浣�)")
+ private BigDecimal subQualitity;
//
// @Excel(name = "鏈�鏂版洿鏂版椂闂�")
// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3