Merge branch 'master' into whole

Helius

2020-09-01 1eac25bee9fa9b09ee25fc6a945ef1a47b3b4299

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

@@ -44,4 +46,6 @@

    public void calHoldOrderHoldFeeAmount();

    public Result changePositionType();

}