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 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index c5dd26d..7c77c1a 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -6,6 +6,7 @@
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
import java.util.List;
@@ -76,7 +77,7 @@
* @param requestVM requestVM
* @return PageInfo<User>
*/
- PageInfo<User> userPage(UserPageRequestVM requestVM);
+ PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM);
/**
--
Gitblit v1.8.0