Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-04 85bafa86f44fbe6646019fd8ecbab79f552ccd0a

 xp-service/xp-account/src/main/java/com/xiaopeng/account/mapper/SysUserMapper.java

@@ -1,14 +1,14 @@
package com.xiaopeng.account.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.account.model.query.SysUserListQuery;
import com.xiaopeng.account.vo.ChangeUserQuery;
import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.common.core.web.page.PageInfo;
import org.apache.ibatis.annotations.Param;

import java.util.ArrayList;
import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.account.vo.ChangeUserQuery;
import com.xiaopeng.account.vo.GetSysUserList;
import com.xiaopeng.api.model.account.SysUser;
import org.apache.ibatis.annotations.Param;

/**
 * 用户表 数据层
@@ -133,7 +133,7 @@
     */
    public SysUser checkEmailUnique(String email);

    List<SysUser> getList(@Param("pageInfo") PageInfo<SysUser> pageInfo, @Param("req") GetSysUserList getSysUserList);
    PageInfo<SysUser> getList(@Param("pageInfo") PageInfo<SysUser> pageInfo, @Param("req") SysUserListQuery sysUserListQuery);

    PageInfo<SysUser> getAllList(@Param("pageInfo") PageInfo<SysUser> pageInfo, @Param("ids") List<Integer> collect);