From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突

---
 server/system_timer/src/main/resources/application-pro.yml |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/server/system_timer/src/main/resources/application-pro.yml b/server/system_timer/src/main/resources/application-pro.yml
index ee05abc..9ef34e8 100644
--- a/server/system_timer/src/main/resources/application-pro.yml
+++ b/server/system_timer/src/main/resources/application-pro.yml
@@ -11,10 +11,7 @@
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
 
-
-
 debug_model: false
-
 captcha_check: true
 
 # Swagger閰嶇疆

--
Gitblit v1.9.3