From 4de99ed19360471d9c9cc192d85f10185db4259f Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期六, 25 五月 2024 09:39:30 +0800 Subject: [PATCH] 解决冲突 --- ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b8d2cd2..3396a4b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -2,6 +2,7 @@ com.ruoyi.system.api.factory.RemoteLogFallbackFactory com.ruoyi.system.api.factory.RemoteFileFallbackFactory com.ruoyi.system.api.factory.SysUserFallbackFactory +com.ruoyi.system.api.factory.GoodsSkuFactory com.ruoyi.system.api.factory.ArticleFallbackFactory com.ruoyi.system.api.factory.AuctionFallbackFactory com.ruoyi.system.api.factory.MemberFallbackFactory -- Gitblit v1.7.1