20210301 平仓时间时间戳

xiaoyong931011

2021-03-01 589a60e79c24aac2fac5a7e00c784d8e4731e036

 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

}