Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94

 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml

@@ -64,7 +64,7 @@
      <if test="record != null">

            <where>

               type = 3

               and (content like '%佣金到账%' or content like '%活动%' or content like '%返佣金额%')

               and (content like '%佣金到账%' or content like '%活动%' or content like '%返利%')

                <if test="record.memberId != null" >

                    and member_id=#{record.memberId}

                </if>