Merge branch 'whole_new_trc20' into data_reform

Helius

2021-02-24 094de2df61a1585f475b1afa4a68cf9fcc371629

 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

}