Merge branch 'master' into whole

Helius

2020-08-14 9e8a8a68126721ac336b1bbc77e1f11d85a538cb

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

@@ -26,6 +26,8 @@

    public Result cancelHoldOrder(Long id);

    public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto);

    public Result cancelHoldOrderBatch(SymbolDto symbolDto);

    public Result setTargetProfitOrLess(ProfitOrLessDto profitOrLessDto);
@@ -44,4 +46,6 @@

    public void calHoldOrderHoldFeeAmount();

    public Result changePositionType();

}