Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 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