Merge branch 'master' into whole_new

Helius

2020-09-11 afc924b0d88ef320ad09060ae49804556efd8eb6

 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);

@@ -38,4 +40,12 @@

    public Result findHoldOrderDetailById(Long id);

    public Result findOrderList(OrderListDto orderListDto);

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

    public Result changePositionType();

}