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/dto/StockInventoryDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 125b52b..4c185e2 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -14,6 +14,7 @@
     private String productName;
     private String model;
     private String unit;
+    private String subUnit;
 
 
     //鍏ュ簱绫诲瀷
@@ -39,4 +40,6 @@
     private BigDecimal currentStock;
 
     private BigDecimal  unLockedQuantity;
+
+    private String rootName;
 }

--
Gitblit v1.9.3