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

xiaoyong931011

2021-09-26 78f6502f7e456149e2265a27dbc98bb18890f996

 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml

@@ -43,6 +43,9 @@
                <if test="record.phone!=null and record.phone!=''">
                    and b.phone like concat('%',  #{record.phone},'%')
                </if>
                <if test="record.type!=null and record.type!=''">
                    and a.type like concat('%',  #{record.type},'%')
                </if>
            </if>
        </where>
        order by a.created_time desc