From f4712cb12cc653b2aff19379fd7756fcfb478b90 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 13:55:36 +0800
Subject: [PATCH] 1、冲突代码合并
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
index b9b0000..8637032 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
northGlassMes:
- url: jdbc:mysql://127.0.0.1:3306/yw_mes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/north_glass_mes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -24,7 +24,7 @@
discovery:
server-addr: 127.0.0.1:8848
redis:
- database: 1
+ database: 0
host: 127.0.0.1
port: 6379
password: 123456
--
Gitblit v1.8.0