From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
index a58e90f..05617b1 100644
--- a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
+++ b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
@@ -15,7 +15,7 @@
<result column="create_user_id" property="createUserId" />
<result column="update_user_id" property="updateUserId" />
</resultMap>
- <select id="pageSalesRefundAmountOrderDto" resultType="com.ruoyi.account.dto.SalesRefundAmountOrderDto">
+ <select id="pageSalesRefundAmountOrderDto" resultType="com.ruoyi.account.bean.dto.SalesRefundAmountOrderDto">
select sl.sales_contract_no,
sl.customer_contract_no,
slp.specification_model,
@@ -27,7 +27,7 @@
from sales_refund_amount_order srao
left join return_management rm on srao.return_management_id = rm.id
left join return_sale_product rs on rm.id = rs.return_management_id
- left join sales_ledger_product slp on rs.return_sale_ledger_product_id = slp.id
+ left join sales_ledger_product slp on rs.return_sales_ledger_product_id = slp.id
left join sales_ledger sl on slp.sales_ledger_id = sl.id
<where>
<if test="ew.salesContractNo != null and ew.salesContractNo !=''">
--
Gitblit v1.9.3