From ea6dfba6e2550f75437398c790559b1eb98ba49d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 04 Mar 2021 17:29:49 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 5958455..d8c3fe1 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
@@ -14,7 +14,9 @@
import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;
import com.xcong.excoin.modules.documentary.dto.CancelDocumentaryOrderSetDto;
import com.xcong.excoin.modules.documentary.dto.DocumentaryOrderSetDto;
+import com.xcong.excoin.modules.documentary.dto.FollowFollowerNoticeDto;
import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto;
+import com.xcong.excoin.modules.documentary.dto.FollowTraderProfitInfoDto;
import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;
import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;
import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto;
@@ -65,8 +67,8 @@
@ApiOperation(value="通知消息", notes="通知消息")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowFollowerNoticeVo.class)})
@PostMapping(value = "/getFollowFollowerNoticeList")
- public Result getFollowFollowerNoticeList() {
- return documentaryService.getFollowFollowerNoticeList();
+ public Result getFollowFollowerNoticeList(@RequestBody @Valid FollowFollowerNoticeDto followFollowerNoticeDto) {
+ return documentaryService.getFollowFollowerNoticeList(followFollowerNoticeDto);
}
/**
@@ -75,7 +77,7 @@
@ApiOperation(value="交易员列表", notes="交易员列表")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)})
@PostMapping(value = "/getFollowTraderProfitInfo")
- public Result getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ public Result getFollowTraderProfitInfo(@RequestBody @Valid FollowTraderProfitInfoDto recordsPageDto) {
return documentaryService.getFollowTraderProfitInfo(recordsPageDto);
}
@@ -164,7 +166,7 @@
}
/**
- * 跟单---跟单设置
+ * 跟单---跟单设置--新增跟单
*/
@ApiOperation(value="跟单---跟单设置--新增跟单", notes="跟单---跟单设置--新增跟单")
@PostMapping(value = "/addDocumentaryOrderSet")
--
Gitblit v1.9.1