From 3f0d3ffb8a64b7eff32cde91a0ab13922a2a3729 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 28 十月 2021 09:40:02 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e1bd9cc..788992a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -170,7 +170,7 @@
     }
 
     /**
-     * 鏍¢獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
+     * 鏍¢獙鎵嬫満鍙风爜鏄惁鍞竴
      *
      * @param user 鐢ㄦ埛淇℃伅
      * @return

--
Gitblit v1.9.3