Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-29 2e9bc4526f025c366c3ab1662dd1864b27b13716

 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

}