Merge remote-tracking branch 'origin/whole' into whole

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

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

@@ -126,7 +126,8 @@
    @ApiOperation(value = "全仓模式 - 变更仓位类型")
    @GetMapping(value = "/changePositionType")
    public Result changePositionType() {
        return contractHoldOrderService.changePositionType();
        return Result.fail("无法切换");
//        return contractHoldOrderService.changePositionType();
    }

    @GetMapping(value = "/findPositionType")