From 249575ff2f0d737f4ef01dfb1c09d82078144fda Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 15:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-yw.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-yw.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-yw.yml
index bfb9745..58c369e 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-yw.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-yw.yml
@@ -1,11 +1,11 @@
 spring:
   datasource:
     dynamic:
-      primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+      primary: northGlassMes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
       strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
       datasource:
-        hangzhoumes:
-          url: jdbc:mysql://192.168.2.100:3306/hangzhoumes?serverTimezone=GMT%2b8&allowMultiQueries=true
+        northGlassMes:
+          url: jdbc:mysql://192.168.2.100:3306/north_glass_mes?serverTimezone=GMT%2b8&allowMultiQueries=true
           username: root
           password: beibo.123/
           driver-class-name: com.mysql.cj.jdbc.Driver

--
Gitblit v1.8.0