From 9e710473223b9cb94d1da9d58499671bffc1863d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 19 九月 2024 15:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

---
 src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
index ad5158e..4521617 100644
--- a/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.mzl.flower.mapper.payment.OrderSettlementDetailMapper">
 
     <select id="selectSettlementDetailList" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
-        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time
+        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no
         FROM t_order_settlement_detail s
         join t_order_item oi on oi.id = s.order_item_id
         join t_order o on o.id = s.order_id

--
Gitblit v1.9.3