From c56b75cd9d5a286cd4b2b4e77ff479d9f5c001e7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 三月 2026 15:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/exportExcel/XpCruiseOrderExportExcel.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/exportExcel/XpCruiseOrderExportExcel.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/exportExcel/XpCruiseOrderExportExcel.java
index c79ee9b..ad689d8 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/exportExcel/XpCruiseOrderExportExcel.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/exportExcel/XpCruiseOrderExportExcel.java
@@ -22,14 +22,11 @@
     @Excel(name = "下单时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @Excel(name = "订单来源", width = 15, replace = {"小鹏小程序_1"})
-    private String orderSource;
-
     @Excel(name = "起点", width = 30)
-    private String startAddress;
+    private String startPointName;
 
     @Excel(name = "终点", width = 30)
-    private String endAddress;
+    private String endPointName;
 
     @Excel(name = "接单车辆", width = 15)
     private String plateNumber;

--
Gitblit v1.7.1