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/feignClient/vehicleConvoy/XpFleetOperationsClient.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpFleetOperationsClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpFleetOperationsClient.java
index 92910ff..ee14198 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpFleetOperationsClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpFleetOperationsClient.java
@@ -1,7 +1,7 @@
 package com.xiaopeng.api.feignClient.vehicleConvoy;
 
 import com.xiaopeng.api.factory.vehicleConvoy.XpFleetOperationsClientFallbackFactory;
-import com.xiaopeng.api.factory.vehicleConvoy.XpFleetVehicleClientFallbackFactory;
+import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
 import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
@@ -33,6 +33,15 @@
     R<List<Long>> getVehicleByUserId(@PathVariable("id") Long id);
 
     /**
+     * 根据人员id 获取所属车队
+     *
+     * @param id 运维人员id
+     * @return 车辆isd
+     */
+    @GetMapping("/logan/inner/fleet-operations/getFleetByUserId/{id}")
+    R<List<XpFleet>> getFleetByUserId(@PathVariable("id") Long id);
+
+    /**
      * 根据运维人员ID查询关联的车队ID列表
      *
      * @param userId 运维人员ID

--
Gitblit v1.7.1