From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
index e496352..a9a77a3 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
@@ -3,11 +3,14 @@
 import com.ruoyi.stock.pojo.StockUninventory;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class StockUninventoryDto  extends StockUninventory {
     private String productName;
     private String model;
     private String unit;
+    private String materialCode;
 
 
     //鍏ュ簱绫诲瀷
@@ -15,4 +18,6 @@
 
     //鍏ュ簱绫诲瀷瀵瑰簲鐨刬d
     private Long recordId;
+
+    private BigDecimal unLockedQuantity;
 }

--
Gitblit v1.9.3