From 520f0c6c8704498ac339234f589b7c82a618a874 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 23 Jun 2021 10:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 d3a7dc1..0ab3bd5 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -232,7 +232,16 @@
 	 * @param user  用户对象
 	 * @param page  分页
 	 */
-	IPage<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+	IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user);
 
-    R<Boolean> saveUser(User user);
+	/**
+	 * 修改用户基本信息,不修改用户密码
+	 * @param user 用户信息
+	 * @autor zhongrj
+	 * @time 2021-06-16
+	 */
+	boolean updateUserInfos(User user);
+
+	R<Boolean> saveUser(User user);
+
 }

--
Gitblit v1.9.3