From 746517aca9d0b7ae334c70b3041a9b1de795addb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 四月 2026 11:08:37 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/VehicleMapQuery.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/VehicleMapQuery.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/VehicleMapQuery.java
index a609997..9cdae6b 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/VehicleMapQuery.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/VehicleMapQuery.java
@@ -14,6 +14,10 @@
     private String plateNumber;
     @ApiModelProperty(value = "运营状态 1运营中 2维修中 3已收车 4车辆异常")
     private String status;
+    @ApiModelProperty(value = "运营状态 1运营中 2维修中 3已收车 4车辆异常")
+    private Integer operatingStatus;
+    @ApiModelProperty(value = "车辆接单状态 1接单中 0空闲")
+    private Integer state;
     @ApiModelProperty(value = "围栏id")
     private String electronicId;
 
@@ -25,4 +29,11 @@
     private Long operationsUserId;
     @ApiModelProperty(value = "车辆id集合 前端忽略")
     private List<Long> vehicleIds;
+
+    @ApiModelProperty(value = "车辆类型 1=在库 2=运营")
+    private Integer vehicleType;
+
+
+    @ApiModelProperty(value = "车队名称")
+    private String fleetName;
 }

--
Gitblit v1.7.1