From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-admin/src/main/resources/application.yml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9147fdd..3fd660c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -64,7 +64,7 @@
devtools:
restart:
# 鐑儴缃插紑鍏�
- enabled: true
+ enabled: false
# redis 閰嶇疆
redis:
# 鍦板潃
--
Gitblit v1.9.3