Merge branch 'master' into master-手术随访

陈昶聿

5 小时以前 27700927ebef0dbe669433ec2cdd3170647c226a

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

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