From 7df12dc3e9940768a3936b93500a9d3a2935d02b Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 09:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ard-admin/src/main/resources/application-dev.yml b/ard-admin/src/main/resources/application-dev.yml
index 0f8b761..a70eda9 100644
--- a/ard-admin/src/main/resources/application-dev.yml
+++ b/ard-admin/src/main/resources/application-dev.yml
@@ -32,14 +32,14 @@
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
 
-# 天宇服务器配置
+# 六合服务器配置
 tianyu:
- # 天宇http服务器地址
+ # 六合http服务器地址
  # endpoint: 192.168.1.97:8060  # 哈尔滨环境
  endpoint: 112.98.104.134:8060  # 哈尔滨环境
  accesskeyid: wuwuwu
  accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
- # 天宇tcp服务器地址
+ # 六合tcp服务器地址
  tcpserver: 192.168.1.97
  tcpport: 8126
 

--
Gitblit v1.9.3