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

xiaoyong931011

2021-05-12 a65df41c3243877352fe6822b65c1836ddc3c19d

 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);