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/StockInRecordMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index dd99bbb..a869ff2 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -8,6 +8,7 @@
p.product_name AS product_name,
pm.model,
pm.unit,
+ pm.material_code AS materialCode,
u.nick_name AS createBy
FROM
stock_in_record AS sir
@@ -37,6 +38,7 @@
SELECT
sir.*,
p.product_name as product_name,
+ pm.material_code as materialCode,
pm.model,
pm.unit,
u.nick_name as createBy
@@ -68,6 +70,7 @@
p.product_name AS product_name,
pm.model,
pm.unit,
+ pm.material_code AS materialCode,
u.nick_name AS createBy
FROM
stock_in_record AS sir
--
Gitblit v1.9.3