合并代码处理冲突

puzhibing

2026-04-12 8bf1d8f1cfcdbda64b2a80653a3ee10d31b69108

 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);
}