From dd4778d2cc47467a39473f02513ec5438b5c9512 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 九月 2025 12:31:58 +0800
Subject: [PATCH] 1、合并冲突
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
index b7ffd2c..1079a49 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
@@ -40,14 +40,4 @@
endpoint: opc.tcp://10.153.19.150:49320
security-policy: basic256sha256
username: admin
- password: 1qaz2wsx3edc4rfv
-kangaroohy:
- milo:
- enabled: true
- primary: default
- config:
- default:
- endpoint: opc.tcp://10.153.19.150:49320
- security-policy: basic256sha256
- username: admin
password: 1qaz2wsx3edc4rfv
\ No newline at end of file
--
Gitblit v1.8.0