Merge remote-tracking branch 'origin/pxb' into xin

xin

2025-07-14 a5a0a3c29a97c807cda8846994d1d8df6adeb9e5

 oying-system/src/main/resources/config/application.yml

@@ -34,7 +34,7 @@
  redis:
    #数据库索引
    database: 0
    host: 127.0.0.1
    host: 192.168.18.13
    port: 6379
    password:
    #连接超时时间