Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-druid.yml

@@ -29,7 +29,7 @@ spring:
         # 数据库索引
         database: 5
         # 密码
-        # password: 123456
+        password: 123456
 redisson:
     address: "redis://ip"
     password: "password"  # 如果有密码的话