Merge branch 'master' into dev

admin/src/main/resources/application-prod.yml

@@ -77,7 +77,6 @@ spring:
       port: 6379
       host: 127.0.0.1
       password: OPYCJ3mJpaU4IsP7ZeIyaus6FtHjLYmhNDGteuRc1gIFCAm7wi
-      database: 10
       database: 0
       lettuce:
         pool: