Merge remote-tracking branch 'origin/master'

liusheng

3 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

Merge remote-tracking branch 'origin/master'

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

@@ -118,7 +118,7 @@
    database: 0
    password: Smartor
    # 连接超时时间
    timeout: 10s
    timeout: 30s
    lettuce:
      pool:
        # 连接池中的最小空闲连接

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

@@ -92,7 +92,7 @@
    # 密码
    password: Smartor
    # 连接超时时间
    timeout: 10s
    timeout: 30s
    lettuce:
      pool:
        # 连接池中的最小空闲连接