Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

 src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java

@@ -19,7 +19,7 @@
   OrderCoinsDealEntity selectWalletCoinOrder(@Param("memberId")Long memberId,@Param("orderId")Long orderId);



   IPage<OrderCoinsDealEntity> findAllWalletCoinOrderInPage(Page<OrderCoinsDealEntity> page,

         OrderCoinsDealEntity orderCoinsDealEntity);

         @Param("record") OrderCoinsDealEntity orderCoinsDealEntity);



   

}