From 1b6ccb5ac0edeb3c7f2ca9035c87b6ec24209c2f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 3d5856f..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;
//鍏ュ簱绫诲瀷
@@ -38,5 +39,7 @@
private BigDecimal totalStockOut;
private BigDecimal currentStock;
- private String unLockedQuantity;
+ private BigDecimal unLockedQuantity;
+
+ private String rootName;
}
--
Gitblit v1.9.3