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

Helius

2021-03-04 e0f37629f6fb0c7b62284e262ef60c5e0bcd82cd

 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

}