From f04c1a5a967679b9984926af72be8a3d3f26c2bb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 25 七月 2023 15:44:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 4e78a8f..9be0eee 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -5,8 +5,10 @@
 import com.yuanchu.limslaboratory.pojo.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import javax.annotation.Resource;
 import java.util.Map;
 import java.util.Objects;
 

--
Gitblit v1.9.3