From f0e93eb5b38d5ce8abeb949a475d1112c2a1645f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 11:30:44 +0800
Subject: [PATCH] Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow
---
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 13 ++++++++++++-
1 files changed, 12 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 8c289da..5958455 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
@@ -22,6 +22,7 @@
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.FollowFollowerNoticeVo;
import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo;
@@ -56,6 +57,16 @@
@GetMapping(value = "/getMemberIsTrader")
public Result getMemberIsTrader() {
return documentaryService.getMemberIsTradeInfo();
+ }
+
+ /**
+ * 通知消息
+ */
+ @ApiOperation(value="通知消息", notes="通知消息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowFollowerNoticeVo.class)})
+ @PostMapping(value = "/getFollowFollowerNoticeList")
+ public Result getFollowFollowerNoticeList() {
+ return documentaryService.getFollowFollowerNoticeList();
}
/**
@@ -155,7 +166,7 @@
/**
* 跟单---跟单设置
*/
- @ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置")
+ @ApiOperation(value="跟单---跟单设置--新增跟单", notes="跟单---跟单设置--新增跟单")
@PostMapping(value = "/addDocumentaryOrderSet")
public Result addDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);
--
Gitblit v1.9.1