From e576965df0f8b95065f650c4d2ded07bf2dacf81 Mon Sep 17 00:00:00 2001 From: longz <longzhaoz@qq.com> Date: 星期二, 29 九月 2026 17:55:55 +0800 Subject: [PATCH] 合并代码 --- ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 5 ++++- ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3 ++- ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3 ++- 3 files changed, 8 insertions(+), 3 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 0b164f4..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 @@ -8,4 +8,5 @@ com.ruoyi.account.api.factory.AppUserTagFallbackFactory com.ruoyi.account.api.factory.JianGuanAccountFallbackFactory com.ruoyi.account.api.factory.VinManagementFallbackFactory -com.ruoyi.account.api.factory.ChargingCardFallbackFactory \ No newline at end of file +com.ruoyi.account.api.factory.ChargingCardFallbackFactory +com.ruoyi.account.api.factory.CompanyAllocateRecordFallbackFactory \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index d605562..727e059 100644 --- a/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -7,4 +7,5 @@ com.ruoyi.chargingPile.api.factory.ParkingRecordFallbackFactory com.ruoyi.chargingPile.api.factory.FaultMessageFallbackFactory com.ruoyi.chargingPile.api.factory.PartnerFallbackFactory -com.ruoyi.chargingPile.api.factory.JianGuanChargingPileFallbackFactory \ No newline at end of file +com.ruoyi.chargingPile.api.factory.JianGuanChargingPileFallbackFactory +com.ruoyi.chargingPile.api.factory.BillingTemplateFallbackFactory \ 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 c765dd4..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 @@ -11,4 +11,7 @@ com.ruoyi.other.api.factory.UserTagFallbackFactory com.ruoyi.other.api.factory.OperatorFallbackFactory com.ruoyi.other.api.factory.SystemConfigurationClientFallbackFactory -com.ruoyi.other.api.factory.JianGuanOtherFallbackFactory \ No newline at end of file +com.ruoyi.other.api.factory.JianGuanOtherFallbackFactory +com.ruoyi.other.api.factory.GroupCompanyFallbackFactory +com.ruoyi.other.api.factory.ChargeAuthorizationFallbackFactory +com.ruoyi.other.api.factory.CompanyPreferentialFallbackFactory \ No newline at end of file -- Gitblit v1.7.1