From 697582a7e65e6110a22dad7bc8241d25fe3ecc51 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 二月 2025 10:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
index 241b97c..71bdc99 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
@@ -54,7 +54,12 @@
                 return R.fail("根据合作商id获取合作商详情失败:" + throwable.getMessage());
 
             }
-    
+
+            @Override
+            public R<List<Partner>> getAllPartner() {
+                return null;
+            }
+
             @Override
             public PageInfo<Site> getSiteListPaging(Integer PageNo, Integer PageSize) {
                 return null;

--
Gitblit v1.7.1