From 829d77f7145514d67d957ad54dbef854440f77d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 31 Jul 2020 17:05:08 +0800
Subject: [PATCH] fix conflect
---
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
index 8d1f9ab..bcc76dd 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
@@ -7,6 +7,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.xcong.excoin.common.response.Result;
@@ -31,6 +32,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
@@ -38,7 +40,7 @@
@RestController
@Slf4j
@RequestMapping(value = "/api/documentary")
-@Api(value = "MemberQuickBuySaleController", tags = "跟单")
+@Api(value = "DocumentaryController", tags = "跟单---跟随者")
public class DocumentaryController {
@Resource
@@ -65,6 +67,16 @@
}
/**
+ * 交易员详情---头部
+ */
+ @ApiOperation(value="交易员详情---头部", notes="交易员详情---头部")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)})
+ @GetMapping(value = "/getFollowTraderProfit")
+ public Result getFollowTraderProfit(@ApiParam(name = "traderId", value = "交易员ID", example = "1") @RequestParam(value = "traderId", required = false) long traderId) {
+ return documentaryService.getFollowTraderProfit(traderId);
+ }
+
+ /**
* 历史带单
* @return
*/
--
Gitblit v1.9.1