Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-12-12 c0b167404dbc4e98ccb8b84f94f48c96bcb3df02

 ard-admin/src/main/resources/application-daqing.yml

@@ -79,3 +79,15 @@
  expire: 3600
  region: us-east-1
  object-dir-prefix: wayline

# 机场单独用的oss配置，要http地址
ossdock:
  enable: true
  provider: minio
  endpoint: http://192.168.10.103:9011
  access-key: admin2
  secret-key: ard123456
  bucket: cloud-bucket
  expire: 3600
  region: us-east-1
  object-dir-prefix: wayline