From b59bca62353f93424818a4dd39068b10948c5267 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期三, 06 五月 2026 11:27:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
index 88f7b0d..e2eb711 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
@@ -38,6 +38,10 @@
     private Long appUserId;
     @ApiModelProperty(value = "开通城市id")
     private Long cityId;
+
+    @ApiModelProperty(value = "合作商ID")
+    private Integer officialPartnerId;
+
     @ApiModelProperty(value = "车辆id")
     private Long vehicleId;
 

--
Gitblit v1.7.1