From 08553c034773008ba68b7b6709683b385610ee4f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 28 五月 2026 09:52:38 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

---
 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java |   13 +++++++++++++
 1 files changed, 13 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 bc08eee..5fa747a 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -15,6 +15,7 @@
     private String productName;
     private String model;
     private String unit;
+    private String batchNo;
 
 
     //鍏ュ簱绫诲瀷
@@ -79,4 +80,16 @@
 
     @Schema(description = "浜у搧id")
     private Long productId;
+
+    @Schema(description = "琚鐢ㄦ暟閲忥紙鏈綊杩橈級")
+    private BigDecimal borrowedQuantity;
+
+    @Schema(description = "鍙鐢ㄦ暟閲忥紙搴撳瓨 - 琚鐢級")
+    private BigDecimal availableQuantity;
+
+    @Schema(description = "浜у搧缂栫爜")
+    private String productCode;
+
+    @Schema(description = "瀹℃壒鐘舵�侊紙鐢ㄤ簬鍏ュ簱/鍑哄簱璁板綍锛�")
+    private Integer approvalStatus;
 }

--
Gitblit v1.9.3