From 6ecf7171775a04bbcb52c9943bcafce699c837a7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 11:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-api/ruoyi-api-order/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-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 108adca..d5590f2 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -4,4 +4,5 @@
 com.ruoyi.order.api.factory.ChargingOrderAccountingStrategyFallbackFactory
 com.ruoyi.order.api.factory.AccountingStrategyDetailOrderFallbackFactory
 com.ruoyi.order.api.factory.AccountingStrategyOrderFallbackFactory
-com.ruoyi.order.api.factory.ShoppingOrderFallbackFactory
\ No newline at end of file
+com.ruoyi.order.api.factory.ShoppingOrderFallbackFactory
+com.ruoyi.order.api.factory.JianGuanOrderFallbackFactory
\ No newline at end of file

--
Gitblit v1.7.1