From 0aad905c1882e956aae418ba784de7a42bf0d0d3 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 27 二月 2026 11:05:03 +0800
Subject: [PATCH] feat(management):处理代码冲突
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpCruiseOrder.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpCruiseOrder.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpCruiseOrder.java
index 3bb932a..31b58f4 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpCruiseOrder.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpCruiseOrder.java
@@ -37,10 +37,6 @@
@ApiModelProperty(value = "车辆id")
private Long vehicleId;
- @ApiModelProperty(value = "车队id")
- @TableField("fleet_id")
- private Long fleetId;
-
@ApiModelProperty(value = "车辆vin")
private String vehicleVin;
--
Gitblit v1.7.1