合并代码处理冲突

puzhibing

2026-04-12 8bf1d8f1cfcdbda64b2a80653a3ee10d31b69108

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationsUserClient.java

@@ -27,7 +27,7 @@
     * @param ids 用户ID列表
     * @return 用户列表
     */
    @PostMapping("/inner/xpOperationsUser/listByIds")
    @PostMapping("/logan/inner/xpOperationsUser/listByIds")
    R<List<XpOperationsUser>> listByIds(@RequestBody List<Long> ids);

    /**
@@ -35,6 +35,6 @@
     * @param nickName 昵称
     * @return 运维用户列表
     */
    @PostMapping("/inner/xpOperationsUser/listByName")
    @PostMapping("/logan/inner/xpOperationsUser/listByName")
    R<List<XpOperationsUser>> listByName(@RequestParam("nickName") String nickName);
}