From da5cf3d82ea1044c338513147b0078be031465a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 20 五月 2026 14:54:10 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpInvoiceVo.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpInvoiceVo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpInvoiceVo.java
index 9ca1fb9..575d2fc 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpInvoiceVo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpInvoiceVo.java
@@ -127,17 +127,22 @@
         @ApiModelProperty(value = "行程结束日期,格式:yyyy-MM-dd")
         private String tripEndDate;
 
+
+        @ApiModelProperty(value = "用户名")
+        private String userName;
+
+        @ApiModelProperty(value = "用户账号")
+        private String userAccount;
+
         @ApiModelProperty(value = "行程人手机号")
         private String phone;
-
-        @ApiModelProperty(value = "车型")
-        private String carType;
 
         @ApiModelProperty(value = "上车时间")
         private String pickupTime;
 
-        @ApiModelProperty(value = "城市")
-        private String city;
+        @ApiModelProperty(value = "下车时间")
+        private String dropOffTime;
+
 
         @ApiModelProperty(value = "起点")
         private String startPoint;
@@ -148,10 +153,13 @@
         @ApiModelProperty(value = "里程(公里)")
         private String mileage;
 
-        @ApiModelProperty(value = "金额(元)")
-        private BigDecimal amount;
-
         @ApiModelProperty(value = "备注")
         private String remark;
+
+        @ApiModelProperty(value = "原价金额")
+        private String oldPrice;
+
+        @ApiModelProperty(value = "币种")
+        private String currency;
     }
 }

--
Gitblit v1.7.1