From 7425196960cc7ecda7d2a09100e0c6456309ff64 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Jul 2022 11:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |    3 +--
 1 files changed, 1 insertions(+), 2 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 402b73f..88d8fd8 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -339,8 +339,7 @@
 	 * @return
 	 */
 	@GetMapping("/getUserList")
-	public R getUserList(User user){
+	public R getUserList(UserVO user){
 		return R.data(userService.getUserList(user));
 	}
-
 }

--
Gitblit v1.9.3