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

zhaowenyu

2025-11-25 aae8b5dc994fffdc211b1f0fc860840cb0d4687a

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

@@ -163,5 +163,6 @@

  # 激活配置文件
  profiles:
    active: daqing-druid,daqing
    #active: prod-druid,prod
    active: dev-druid,dev
    #active: dev-druid,dev