Merge branch 'master' into follow

Helius

2020-08-11 f91a65805c27c2bb01eb94f1ec9c2afa07a44020

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

@@ -42,4 +42,6 @@

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

}