From d597b03477f904bc87bc9c3a984f9bfa485a906d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 三月 2026 18:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
index e87d3f1..eeb03c0 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
@@ -211,8 +211,8 @@
 
     @ApiOperation(value = "巡游订单详情", tags = {"管理后台-巡游订单"})
     @GetMapping(value = "/api/v1/cruise-order/getDetailById/{id}")
-    public R<XpCruiseOrder> getDetailById(@PathVariable Long id){
-        XpCruiseOrder xpCruiseOrder = xpCruiseOrderService.getById(id);
+    public R<XpCruiseOrderPageVO> getDetailById(@PathVariable Long id){
+        XpCruiseOrderPageVO xpCruiseOrder = xpCruiseOrderService.getDetailById(id);
         return R.ok(xpCruiseOrder);
     }
 }

--
Gitblit v1.7.1