fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
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(); 
    } 
 
}