From 974c2f29b973d489512146cc8c7fa58448368959 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 29 十一月 2024 14:03:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 0e81b22..55fb60b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -3,4 +3,5 @@
 com.ruoyi.other.api.factory.GoodsAreaClientFallbackFactory
 com.ruoyi.other.api.factory.GoodsVipClientFallbackFactory
 com.ruoyi.other.api.factory.SeckillActivityInfoClientFallbackFactory
-com.ruoyi.other.api.factory.GoodsBargainPriceClientFallbackFactory
\ No newline at end of file
+com.ruoyi.other.api.factory.GoodsBargainPriceClientFallbackFactory
+com.ruoyi.other.api.factory.RemoteVipSettingFallbackFactory
\ No newline at end of file

--
Gitblit v1.7.1