From d48849cfcc2e45340921edab4685a8f260793b50 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 11 四月 2026 10:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

---
 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java |    2 +-
 1 files changed, 1 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..125b52b 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -38,5 +38,5 @@
     private BigDecimal totalStockOut;
     private BigDecimal currentStock;
 
-    private String  unLockedQuantity;
+    private BigDecimal  unLockedQuantity;
 }

--
Gitblit v1.9.3