From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..fca4232 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
@@ -43,9 +43,13 @@
     @ApiResponses({
             @ApiResponse(code = 0, message = "success", response = HoldOrderListVo.class)
     })
+//    @GetMapping(value = "/findHoldOrderList")
+//    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
+//        return contractHoldOrderService.findHoldOrderList(symbol, 1);
+//    }
     @GetMapping(value = "/findHoldOrderList")
-    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol", required = false) String symbol) {
-        return contractHoldOrderService.findHoldOrderList(symbol, 1);
+    public Result findHoldOrderList(@ApiParam(name = "symbol", value = "币种", example = "BTC/USDT") @RequestParam(value = "symbol") String symbol) {
+    	return contractHoldOrderService.findHoldOrderList(symbol, 1);
     }
 
     @ApiOperation(value = "查询当前持仓跟单订单列表 -- 轮询")

--
Gitblit v1.9.1