From ec09030f0730809145c97bfaa0bd0387a7d990bf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 19 Jul 2022 17:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 82139b1..638d846 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -333,4 +333,14 @@
return R.success("操作成功");
}
+ /**
+ * 查询用户信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserList")
+ public R getUserList(UserVO user){
+ return R.data(userService.getUserList(user));
+ }
+
}
--
Gitblit v1.9.3