conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

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

@@ -22,7 +22,7 @@

    public void updateOrderIsCanClosingAndBatchNoById(Long id);

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

    public Result cancelHoldOrder(Long id);

@@ -38,4 +38,10 @@

    public Result findHoldOrderDetailById(Long id);

    public Result findOrderList(OrderListDto orderListDto);

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

}