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

kaiyu

2021-03-12 37d76adf129d41f65342874886c43db450ecb0ef

 screen-api/src/main/resources/application-dev.yml

@@ -41,7 +41,7 @@
    port: 6379
    password: chenkaiyu111
    timeout: 30000
    database: 14
    database: 15
    pool:
      max-active: 256
      max-wait: 30000