From 7c0646796dae5494323b4bf6676d92129e4206d5 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 29 九月 2026 18:21:00 +0800 Subject: [PATCH] Merge branch '2.3' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.3 --- ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 4 ++-- ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index bc011b8..eb779e9 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -9,6 +9,4 @@ com.ruoyi.account.api.factory.JianGuanAccountFallbackFactory com.ruoyi.account.api.factory.VinManagementFallbackFactory com.ruoyi.account.api.factory.ChargingCardFallbackFactory -com.ruoyi.account.api.factory.AppUserWhitelistFallbackFactory -com.ruoyi.account.api.factory.CompanyAllocateRecordFallbackFactory -com.ruoyi.account.api.factory.TAppUserSiteFavoriteFallbackFactory \ No newline at end of file +com.ruoyi.account.api.factory.CompanyAllocateRecordFallbackFactory \ No newline at end of file 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 581b187..2eb6d8b 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 @@ -13,5 +13,5 @@ com.ruoyi.other.api.factory.SystemConfigurationClientFallbackFactory com.ruoyi.other.api.factory.JianGuanOtherFallbackFactory com.ruoyi.other.api.factory.GroupCompanyFallbackFactory -com.ruoyi.other.api.factory.CompanyPreferentialFallbackFactory -com.ruoyi.other.api.factory.ChargeAuthorizationFallbackFactory \ No newline at end of file +com.ruoyi.other.api.factory.ChargeAuthorizationFallbackFactory +com.ruoyi.other.api.factory.CompanyPreferentialFallbackFactory \ No newline at end of file -- Gitblit v1.7.1