Merge remote-tracking branch 'origin/master'

xuhy

2025-03-25 ac9328daa570069fa5617a2035d2700e6fed76aa

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java

@@ -46,7 +46,7 @@

            @Override
            public R<List<GetSiteListDTO>> getSiteListByUserId(Long userId) {
                return null;
                return R.fail("获取数据失败" + throwable.getMessage());
            }

            @Override
@@ -57,7 +57,7 @@

            @Override
            public R<List<Partner>> getAllPartner() {
                return null;
                return R.fail("获取数据失败：" + throwable.getMessage());
            }

            @Override