From 17cfbc75dc326f3e5963ee17c99d6516497f8cf1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 9 +++++++++
1 files changed, 9 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..88d8fd8 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,13 @@
return R.success("操作成功");
}
+ /**
+ * 查询用户信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserList")
+ public R getUserList(UserVO user){
+ return R.data(userService.getUserList(user));
+ }
}
--
Gitblit v1.9.3