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/service/IUserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 364bf2c..9906a92 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -212,5 +212,5 @@
 	 * @param user
 	 * @return
 	 */
-    List<User> getUserList(User user);
+    List<User> getUserList(UserVO user);
 }

--
Gitblit v1.9.3