From 65dcb2917a3b68e19351878e1d93f0b0ecb83cb5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 13 二月 2026 16:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpOperationsUserService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpOperationsUserService.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpOperationsUserService.java
index fb703b8..187a800 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpOperationsUserService.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpOperationsUserService.java
@@ -1,7 +1,10 @@
 package com.xiaopeng.account.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xiaopeng.account.model.query.XpOperationsUserPageQuery;
 import com.xiaopeng.api.model.account.XpOperationsUser;
+import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
+import com.xiaopeng.common.core.web.page.PageInfo;
 
 import java.util.List;
 
@@ -20,4 +23,11 @@
      * @return
      */
     List<XpOperationsUser> listByName(String nickName);
+
+    /**
+     * 根据条件查询用户及角色信息
+     * @param query
+     * @return
+     */
+    PageInfo<XpOperationsUserWithRoleVO> selectUserPageByConditions(XpOperationsUserPageQuery query);
 }

--
Gitblit v1.7.1