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

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

 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