20210304 消息提醒

xiaoyong931011

2021-03-04 998789a2ae1fd237d314c8139ee87d207c2d30f3

 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

}