Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql

yudao-server/src/main/resources/application-dev.yaml

@@ -60,6 +60,7 @@ spring:
     host: 400-infra.server.iocoder.cn # 地址
     port: 6379 # 端口
     database: 1 # 数据库索引
+    password: 123456
 
 jasypt:
   encryptor:

yudao-server/src/main/resources/application-local.yaml

@@ -68,6 +68,7 @@ spring:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
+    password: 123456
 
 jasypt:
   encryptor: