From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
index 0282db7..3435fbf 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -176,7 +176,7 @@
}
@Override
- public void setStatus(UserVO user) {
+ public void setStatus(User user) {
userMapper.setStatus(user);
}
@@ -194,4 +194,9 @@
public List<Department> getDeptAdmins(Integer id) {
return userMapper.getDeptAdmins(id);
}
+
+ @Override
+ public User getUserByExamByTemplateId(ExamPaper examPaper) {
+ return userMapper.getUserByExamByTemplateId(examPaper);
+ }
}
--
Gitblit v1.8.0