Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-04 85bafa86f44fbe6646019fd8ecbab79f552ccd0a

 xp-service/xp-account/src/main/java/com/xiaopeng/account/service/ISysUserService.java

@@ -1,11 +1,11 @@
package com.xiaopeng.account.service;

import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.account.vo.GetSysUserList;
import com.xiaopeng.account.model.query.SysUserListQuery;
import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.common.core.web.page.PageInfo;

import java.util.List;

/**
 * 用户 业务层
@@ -124,5 +124,5 @@
     */
    int deleteUserByIds(Long[] userIds);

    PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList);
    PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, SysUserListQuery sysUserListQuery);
}