Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -4,7 +4,7 @@
import java.util.Collections;

import java.util.List;

import java.util.stream.Collectors;

import javax.validation.Validator;

import jakarta.validation.Validator;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;