Merge branch 'master' into whole

Helius

2020-08-14 9e8a8a68126721ac336b1bbc77e1f11d85a538cb

 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java

@@ -115,10 +115,16 @@
        return contractHoldOrderService.findOrderDetailById(id);
    }

    @ApiOperation(value = "全仓模式平仓")
    @ApiOperation(value = "全仓模式 - 平仓")
    @PostMapping(value = "/closingOrder")
    public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) {
        return null;
        return Result.ok("平仓成功");
    }

    @ApiOperation(value = "全仓模式 - 变更仓位类型")
    @GetMapping(value = "/changePositionType")
    public Result changePositionType() {
        return contractHoldOrderService.changePositionType();
    }

}