From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index 822744f..59eed54 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/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")

--
Gitblit v1.9.1