From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-admin/src/main/resources/application.yml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zhitan-admin/src/main/resources/application.yml b/zhitan-admin/src/main/resources/application.yml
index b766372..ef4fb4a 100644
--- a/zhitan-admin/src/main/resources/application.yml
+++ b/zhitan-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
   # 鍚嶇О
   name: admin
   # 鐗堟湰
-  version: 3.8.7
+  version: 2.5.2
   # 鐗堟潈骞翠唤
   copyrightYear: 2024
   profile: ./uploadPath
@@ -11,6 +11,8 @@
   addressEnabled: true
   # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
   captchaType: math
+  # 鍩熷悕鍦板潃
+  domainName: https://demo-ems.zhitancloud.com/prod-api
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
@@ -144,6 +146,7 @@
   token: ==
   org: org
   bucket: bucket
+  measurement: data
 
 ###################### MQTT #################################
 mqtt:

--
Gitblit v1.9.3