From 858466c28185d1900c6ef332e5b0e4bc9e7701dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 18:35:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 06741c3..eeab48f 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -35,9 +35,11 @@
         select
         a.*,
         b.name,
+        c.pay_method payMethod,
         b.phone
         from mall_money_flow a
         inner join mall_member b on a.member_id=b.id
+        left join mall_order_info c on a.order_no = c.order_no
         <where>
             a.type != 6
             <if test="record != null" >

--
Gitblit v1.9.1