From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 5 +++++
1 files changed, 5 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 37b5efe..bfa6fe7 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -37,4 +37,9 @@
private BigDecimal totalStockIn;
private BigDecimal totalStockOut;
private BigDecimal currentStock;
+
+ private BigDecimal unLockedQuantity;
+
+ //浜у搧id
+ private Long productId;
}
--
Gitblit v1.9.3