Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

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

@@ -78,7 +78,7 @@
    # 数据库索引
    database: 0
    # 密码
    password: 123456
#    password: 123456
    # 连接超时时间
    timeout: 10s
    lettuce:
@@ -99,7 +99,7 @@
  # 令牌密钥
  secret: abcdefghijklmnopqrstuvwxyz
  # 令牌有效期（默认30分钟）
  expireTime: 30
  expireTime: 450

# PageHelper分页插件
pagehelper: