20210304 消息提醒

xiaoyong931011

2021-03-04 16f6d4eedb8e2174f0959d7735a24d6c53d7b6e8

 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

}