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/resources/mapper/stock/StockInventoryMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 287d64a..db26cc9 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -68,7 +68,8 @@
         pm.material_code as materialCode,
         p.product_name,
         p.parent_id,
-        p2.product_name AS parent_name
+        p2.product_name AS parent_name,
+        si.batch_no
         FROM stock_inventory si
         LEFT JOIN product_model pm ON si.product_model_id = pm.id
         LEFT JOIN product p ON pm.product_id = p.id

--
Gitblit v1.9.3