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 }
