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

zhaowenyu

2025-11-29 f10e12cd88f5f73fc57667ff958abdda50c23ec4

 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