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

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/map/RouteAndFareDto.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/map/RouteAndFareDto.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/map/RouteAndFareDto.java
index dbe5e9d..32ea0c0 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/map/RouteAndFareDto.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/map/RouteAndFareDto.java
@@ -9,6 +9,10 @@
 @lombok.Data
 @ApiModel(description = "线路和运费Dto")
 public class RouteAndFareDto {
+
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+
     @ApiModelProperty(value = "出发地")
     @NotNull(message = "出发地不能为空")
     private LonLatDto origin;
@@ -32,8 +36,5 @@
 
     @ApiModelProperty("车辆id")
     private Long vehicleId;
-
-    public RouteAndFareDto() {
-    }
 
 }

--
Gitblit v1.7.1