Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

 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>