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/TraderController.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java new file mode 100644 index 0000000..9508ed3 --- /dev/null +++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java @@ -0,0 +1,34 @@ +package com.xcong.excoin.modules.documentary.controller; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.xcong.excoin.common.response.Result; +import com.xcong.excoin.modules.documentary.service.DocumentaryService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; + +@RestController +@Slf4j +@RequestMapping(value = "/api/trader") +@Api(value = "TraderController", tags = "跟单---交易员") +public class TraderController { + + @Resource + DocumentaryService documentaryService; + + /** + * 成为交易员---立即入驻 + */ + @ApiOperation(value="成为交易员---立即入驻", notes="成为交易员---立即入驻") + @GetMapping(value = "/beTrader") + public Result beTrader() { + return documentaryService.beTrader(); + } + +} -- Gitblit v1.9.1