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