From b3b96cfd900c3dee5dc84e53d5677fc6642f85e6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 18 Dec 2025 09:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-admin/src/main/resources/application-prod.yml |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index 89786b7..0e1b10f 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -86,15 +86,3 @@
 
 dock:
   endpoint: http://111.40.46.199:9011
-
-# 机场单独用的oss配置，要http地址 http://192.168.1.3:9011
-#ossdock:
-#  enable: true
-#  provider: minio
-#  endpoint: http://111.40.46.199:9011
-#  access-key: admin2
-#  secret-key: ard123456
-#  bucket: cloud-bucket
-#  expire: 3600
-#  region: us-east-1
-#  object-dir-prefix: wayline
\ No newline at end of file

--
Gitblit v1.9.3