xiaoyong931011
2021-03-04 c0fac904e85b0b0131cde4c6b7f1e8de9f095089
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
}