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

Helius

2021-05-27 7f133cb8fc080b64ab8002b35f04b646f95a6abf

 src/main/resources/mapper/otc/OtcMsgUserListDao.xml

@@ -13,8 +13,6 @@
        <where>
            <if test="record!=null">
                    a.member_id = #{record.memberId}
                    or
                    a.target_id = #{record.memberId}
            </if>
        </where>
        order by a.create_time desc
@@ -25,12 +23,15 @@
              *
        from otc_msg_user_list a
        <where>
                    (a.member_id = #{memberId} and a.target_id = #{targetId})
                    or
                    (a.member_id = #{targetId} and a.target_id = #{memberId})
                    a.member_id = #{memberId} and a.target_id = #{targetId}
        </where>
        order by a.create_time desc
    </select>

    <select id="selectChatListByToAndFrom" resultType="com.xcong.excoin.modules.otc.entity.OtcMsgUserListEntity">
        select * from otc_msg_user_list
        where member_id=#{from} and target_id=#{to}
    </select>


</mapper>