Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git i...

xiaoyong931011

2021-01-29 33a69c65e1f6701bd29ef74d0681dbbe9a21cea7

 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

}