From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突
---
jeecg-server-cloud/docker-compose-base.yml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/jeecg-server-cloud/docker-compose-base.yml b/jeecg-server-cloud/docker-compose-base.yml
index 2c9efd1..9ff0496 100644
--- a/jeecg-server-cloud/docker-compose-base.yml
+++ b/jeecg-server-cloud/docker-compose-base.yml
@@ -4,7 +4,7 @@
build:
context: ../db
environment:
- MYSQL_ROOT_PASSWORD: root
+ MYSQL_ROOT_PASSWORD: 123456
MYSQL_ROOT_HOST: '%'
TZ: Asia/Shanghai
restart: always
--
Gitblit v1.9.3