From ba94aa39ae925d9021b0ca13ca0b11dd6843656b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 30 十二月 2023 14:22:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zy-asrs-framework/src/main/resources/META-INF/spring.factories |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-framework/src/main/resources/META-INF/spring.factories b/zy-asrs-framework/src/main/resources/META-INF/spring.factories
index 73bd6d4..ae584d1 100644
--- a/zy-asrs-framework/src/main/resources/META-INF/spring.factories
+++ b/zy-asrs-framework/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.core.config.CoolBaseConfig
\ No newline at end of file
+#org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.core.config.CoolBaseConfig
\ No newline at end of file

--
Gitblit v1.9.1