From 19144edf60036ad3b9a30b1b92e985de69231137 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 21 Nov 2025 08:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 7e78448..243a257 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -163,5 +163,6 @@
 
   # 激活配置文件
   profiles:
+    active: daqing-druid,daqing
     #active: prod-druid,prod
-    active: dev-druid,dev
\ No newline at end of file
+    #active: dev-druid,dev
\ No newline at end of file

--
Gitblit v1.9.3