From 7496e718f10286651b9e2d08a8b8548cd3b242b6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 10:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

---
 src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
index 5507b3f..a3ed052 100644
--- a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
@@ -1,15 +1,11 @@
 package com.ruoyi.project.system.mapper;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.collaborativeApproval.pojo.MeetingMinutes;
+import com.ruoyi.project.system.domain.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.ruoyi.project.system.domain.SysUser;
-import org.springframework.beans.PropertyValues;
+import java.util.List;
 
 /**
  * 鐢ㄦ埛琛� 鏁版嵁灞�

--
Gitblit v1.9.3