From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:50:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index ed2ac7c..9bf821e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,11 +2,11 @@
port: 8084
spring:
profiles:
- active: dev
+ active: cz
application:
name: temperingGlass
liquibase:
- enabled: true
+ enabled: false
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
@@ -14,7 +14,9 @@
mes:
width: 2800
height: 5000
+kangaroohy:
milo:
+ enabled: false
primary: default
config:
default:
--
Gitblit v1.8.0