明星电力充电桩
parent: 553a9c13 | 补丁 | 提交 | ignore whitespace
zhibing.pu
2024-08-13 f62a7e8289547222640dcfc423d0f74307222e0e 
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

 Conflicts:
	ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
2个文件已修改
4 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports


@@ -1,2 +1,3 @@


com.ruoyi.chargingPile.api.factory.ChargingPileFallbackFactory


com.ruoyi.chargingPile.api.factory.SiteFallbackFactory


com.ruoyi.chargingPile.api.factory.SiteFallbackFactory


com.ruoyi.chargingPile.api.factory.ParkingLotFallbackFactory




 ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports


@@ -1,4 +1,5 @@


com.ruoyi.other.api.factory.OtherFallbackFactory


com.ruoyi.other.api.factory.UserSiteFallbackFactory


com.ruoyi.other.api.factory.RoleSiteFallbackFactory


com.ruoyi.other.api.factory.TEvaluationTagFallbackFactory


com.ruoyi.other.api.factory.VipFallbackFactory