Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 pom.xml

@@ -87,7 +87,7 @@
   <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-tomcat</artifactId>
      <scope>compile</scope>
      <scope>provided</scope>
   </dependency>

   <dependency>