xiaoyong931011
2021-03-19 d4aeb39d96d6d9be36db500ce1d5f803ba3c6b71
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
}