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

xiaoyong931011

2021-04-16 17b569ed8554e755c9e5feedf6e7882cdf2c8d01

 src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml

@@ -28,7 +28,7 @@
      select * from coins_order_deal where order_id= #{orderId} and member_id = #{memberId}

   </select>

   

   <select id="selectContractOrderInPage" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">

   <select id="findAllWalletCoinOrderInPage" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">

        select * from coins_order_deal

        <if test="record != null">

            <where>