Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-26 858466c28185d1900c6ef332e5b0e4bc9e7701dd

 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" >