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

xiaoyong931011

2021-05-28 6a0e1564efae8aa6069bddedef749bf5c8b9b0c4

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

@@ -28,7 +28,7 @@

    BigDecimal selectFollowOrderTotalProfitByMemberId(@Param("memberId") Long memberId);

    Integer selectFollowOrderCntForWinRate(@Param("memberId") Long memberId, @Param("type") Integer type);
    BigDecimal selectFollowOrderCntForWinRate(@Param("memberId") Long memberId, @Param("type") Integer type);

    List<ContractOrderEntity> selectWholeOpenOrderByOrderNo(@Param("orderNo") String orderNo);