From 827bbc2b17fdcf2638a9646af0e99821aa63caa1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 21 六月 2020 10:06:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 396ea3a..39e5d63 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -192,6 +192,7 @@
      * 
      * @param user 鐢ㄦ埛淇℃伅
      */
+    @Override
     public void checkUserAllowed(SysUser user)
     {
         if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
@@ -268,10 +269,11 @@
     /**
      * 淇敼鐢ㄦ埛澶村儚
      * 
-     * @param userId 鐢ㄦ埛ID
+     * @param userName 鐢ㄦ埛鍚�
      * @param avatar 澶村儚鍦板潃
      * @return 缁撴灉
      */
+    @Override
     public boolean updateUserAvatar(String userName, String avatar)
     {
         return userMapper.updateUserAvatar(userName, avatar) > 0;
@@ -376,6 +378,7 @@
      * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
      * @return 缁撴灉
      */
+    @Override
     public int deleteUserByIds(Long[] userIds)
     {
         for (Long userId : userIds)

--
Gitblit v1.9.3