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

zhaowenyu

2025-12-13 83c58f574b2b9006ac28d0eca1e64243cc81948f

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

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

# 机场单独用的oss配置，要http地址
dock:
  endpoint: http://111.40.46.199:9011