fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java

@@ -22,9 +22,11 @@

    public void updateOrderIsCanClosingAndBatchNoById(Long id);

    public Result findHoldOrderList(String symbol);
    public Result findHoldOrderList(String symbol, int type);

    public Result cancelHoldOrder(Long id);

    public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto);

    public Result cancelHoldOrderBatch(SymbolDto symbolDto);

@@ -40,4 +42,14 @@

    public Result findOrderList(OrderListDto orderListDto);

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

<<<<<<< HEAD
    public Result changePositionType();
=======
    public void calHoldFeeAmountForBondAmount();
>>>>>>> master

}