From 43450d7859c291ac190c8cbab5728705fdeb18f7 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期日, 22 六月 2025 17:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycds-wms-dev' into ycds-wms-dev

---
 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