From 793530b1b9ba7161d9705fb304d8ad9b7364d7d3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 二月 2026 22:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationUserClient.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationUserClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationUserClient.java
index ffeb32a..e340969 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationUserClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationUserClient.java
@@ -1,7 +1,9 @@
 package com.xiaopeng.api.feignClient.account;
 
+import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
 import com.xiaopeng.api.factory.account.XpAppUserClientFallbackFactory;
 import com.xiaopeng.api.model.account.XpOperationsUser;
+import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -43,4 +45,20 @@
      */
     @PostMapping("/inner/xpOperationsUser/listByName")
     R<List<XpOperationsUser>> listByName(@RequestParam("nickName") String nickName);
+
+    /**
+     * 根据用户ID列表批量查询用户及角色信息
+     * @param ids 用户ID列表
+     * @return 用户及角色信息列表
+     */
+    @PostMapping("/inner/xpOperationsUser/listByIdsWithRole")
+    R<List<XpOperationsUserWithRoleVO>> listByIdsWithRole(@RequestBody List<Long> ids);
+
+    /**
+     * 根据条件查询用户及角色信息
+     * @param dto 查询条件
+     * @return 用户及角色信息列表
+     */
+    @PostMapping("/inner/xpOperationsUser/queryByConditions")
+    R<List<XpOperationsUserWithRoleVO>> queryByConditions(@RequestBody XpOperationsUserQueryDTO dto);
 }

--
Gitblit v1.7.1