Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-12 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed

 screen-api/src/main/java/com/moral/api/controller/TestController.java

@@ -14,9 +14,9 @@


@Slf4j
@Api(tags = {"大屏"})
@Api(tags = {"测试"})
@RestController
@RequestMapping("/api")
@RequestMapping("/test")
public class TestController {

    @Autowired