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

xiaoyong931011

2021-03-26 4bfb58a3ee4a2c8be9588298c038efda3f5fe85e

 src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java

@@ -47,5 +47,6 @@
    public void calHoldOrderHoldFeeAmount();

    public Result changePositionType();
    public void calHoldFeeAmountForBondAmount();

}