Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

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

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

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

}