From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/vehicleConvoy/XpFleetOperationsClientFallbackFactory.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/vehicleConvoy/XpFleetOperationsClientFallbackFactory.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/vehicleConvoy/XpFleetOperationsClientFallbackFactory.java
index 9344ad7..9769185 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/vehicleConvoy/XpFleetOperationsClientFallbackFactory.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/vehicleConvoy/XpFleetOperationsClientFallbackFactory.java
@@ -1,6 +1,7 @@
 package com.xiaopeng.api.factory.vehicleConvoy;
 
 import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
+import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
 import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
 import com.xiaopeng.common.core.domain.R;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,12 @@
             }
 
             @Override
+            public R<List<XpFleet>> getFleetByUserId(Long id) {
+                log.error("根据人员id 获取所属车队,人员ID: {},原因: {}", id, cause.getMessage());
+                return R.ok(new ArrayList<>());
+            }
+
+            @Override
             public R<List<Long>> getFleetIdsByUserId(Long userId) {
                 log.error("根据人员ID获取车队信息失败 {}",  cause.getMessage());
                 return R.fail("根据人员ID获取车队信息失败");

--
Gitblit v1.7.1