Merge branch 'master' into whole_new

Helius

2020-09-13 099e6d54520dad06b887340ba02d532235360e5d

 src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java

@@ -29,4 +29,6 @@
    List<ContractOrderEntity> selectWholeOpenOrderByOrderNo(@Param("orderNo") String orderNo);

    BigDecimal selectWholeFeeAmountByOrderNo(@Param("orderNo") String orderNo);

    int updateOrderProfitOrLessById(@Param("rewardAmount") BigDecimal rewardAmount, @Param("rewardRatio") BigDecimal rewardRatio, @Param("id") Long id);
}