20210322 平仓禁用操作（平仓，一键平仓，止盈止损,调整保证金，开仓）

xiaoyong931011

2021-03-22 0dc8f42e10f9923967a04ee93c87a37e0d514dfa

 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

}