20210325 跟随者的历史订单显示爆仓，爆仓算入跟随者收益

xiaoyong931011

2021-03-25 198748280d67f7ea904dd642f485634ddd005049

 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

}