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

zhaowenyu

2026-03-09 9051d6194b11a2151bd62b9be731689524a32d5a

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

@@ -87,4 +87,12 @@

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