From 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 10:25:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 10a17e9..33b7599 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,7 +80,4 @@
 
     @Schema(description = "浜у搧id")
     private Long productId;
-
-    @Schema(description = "鎵规鍙�")
-    private String batchNo;
 }

--
Gitblit v1.9.3