From 83dab684cb4db66e67d8d08adb2d6e05277a5e9b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 11:10:02 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

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

diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index 44ec8cf..0c3addb 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -63,7 +63,7 @@
 		<if test="record != null">
             <where>
             	type = 3
-            	and content like '%佣金到账%'
+            	and (content like '%佣金到账%' or content like '%活动%' or content like '%返利%')
                 <if test="record.memberId != null" >
                     and member_id=#{record.memberId}
                 </if>

--
Gitblit v1.9.1