From b87239353afdc0c9502e81961249d527dd8ad54e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 15:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/UserService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index 833fb39..7c77c1a 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -5,8 +5,8 @@
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
import java.util.List;
@@ -77,7 +77,7 @@
* @param requestVM requestVM
* @return PageInfo<User>
*/
- PageInfo<User> userPage(UserPageRequestVM requestVM);
+ PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM);
/**
@@ -135,7 +135,7 @@
User getUserByRealName(String realName);
- void setStatus(UserVO user);
+ void setStatus(User user);
User getUserByExam(ExamPaper examPaper);
--
Gitblit v1.8.0