From e0e991e0887f11f12cd3ccf0208b151b09586329 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 22 一月 2026 15:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 369e28f..3202797 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -23,10 +23,12 @@
sor.*,
p.product_name as productName,
pm.model,
- pm.unit
+ pm.unit,
+ u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
+ LEFT JOIN sys_user as u on sir.create_user = u.user_id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{param.timeStr},'%')
--
Gitblit v1.9.3