Merge remote-tracking branch 'origin/master'

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

@@ -60,7 +60,7 @@ spring:
         type: redis
     # redis 配置
     redis:
-        database: 1
+        database: 6
         # 地址
         host: sh-crs-lfzs3n8w.sql.tencentcdb.com
         # 端口，默认为6379