20210302 我的跟单--我的跟单--历史跟单

xiaoyong931011

2021-03-02 4d33da83dcc57e0347e503958d0ad30a59f42ac9

 src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java

@@ -46,10 +46,7 @@

    public void calHoldOrderHoldFeeAmount();

<<<<<<< HEAD
    public Result changePositionType();
=======
    public void calHoldFeeAmountForBondAmount();
>>>>>>> master

}