Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

wzy

2021-03-03 9a23df1d457f474905141930a4403b9bcd22d75f

 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

}