From e4c10a806ff29d18cdbdd182a5930316eae3fd83 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 07 四月 2026 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 8976a3a..d8f0a88 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -23,14 +23,10 @@
SELECT
pro.*,
sm.supplier_name as supplierName,
- pl.purchase_contract_number as purchaseContractNumber,
- su.user_name as returnUserName,
- su1.user_name as createUserName
+ pl.purchase_contract_number as purchaseContractNumber
FROM purchase_return_orders pro
LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
- LEFT JOIN sys_user su ON su.user_id = pro.return_user_id
- LEFT JOIN sys_user su1 ON su1.user_id = pro.prepared_user_id
where 1=1
<if test="params.no != null and params.no != '' ">
AND pro.no LIKE CONCAT('%',#{params.no},'%')
--
Gitblit v1.9.3