From 8bf1d8f1cfcdbda64b2a80653a3ee10d31b69108 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 12 四月 2026 18:55:26 +0800
Subject: [PATCH] 合并代码处理冲突
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java
index ca2a6f7..c240c2d 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java
@@ -23,7 +23,7 @@
* @param
* @return
*/
- @PostMapping("/inner/pushOrder")
+ @PostMapping("/logan/inner/pushOrder")
R<Boolean> pushOrder(@RequestBody PushOrderDto dto);
@@ -32,6 +32,6 @@
* @param
* @return
*/
- @PostMapping("/inner/cancelOrder")
+ @PostMapping("/logan/inner/cancelOrder")
R<Boolean> cancelOrder(@RequestBody PushOrderDto dto);
}
--
Gitblit v1.7.1