diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
index b19697e..5196384 100644
--- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
+++ b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
@@ -46,7 +46,7 @@ public class TokenService {
         String userName = loginUser.getSysUser().getUserName();
         loginUser.setToken(token);
         loginUser.setUserid(userId);
-        loginUser.setUsername(userName);
+        loginUser.setUsernameOrEmail(userName);
         loginUser.setIpaddr(IpUtils.getIpAddr());
         refreshToken(loginUser);
 
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
index ce39e96..c835352 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
@@ -25,7 +25,7 @@ public class LoginUser implements Serializable {
     /**
      * 用户名
      */
-    private String username;
+    private String usernameOrEmail;
 
     /**
      * 登录时间
@@ -73,12 +73,12 @@ public class LoginUser implements Serializable {
         this.userid = userid;
     }
 
-    public String getUsername () {
-        return username;
+    public String getUsernameOrEmail() {
+        return usernameOrEmail;
     }
 
-    public void setUsername (String username) {
-        this.username = username;
+    public void setUsernameOrEmail(String usernameOrEmail) {
+        this.usernameOrEmail = usernameOrEmail;
     }
 
     public Long getLoginTime () {
diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
index 6be7436..610273d 100644
--- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
+++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
@@ -49,7 +49,7 @@ public class SysUser extends BaseEntity {
      * 用户账号
      */
     @Excel(name = "登录名称")
-    private String userName;
+    private String usernameOrEmail;
 
     /**
      * 用户昵称
@@ -179,11 +179,11 @@ public class SysUser extends BaseEntity {
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName () {
-        return userName;
+        return usernameOrEmail;
     }
 
-    public void setUserName (String userName) {
-        this.userName = userName;
+    public void setUserName (String usernameOrEmail) {
+        this.usernameOrEmail = usernameOrEmail;
     }
 
     @Email(message = "邮箱格式不正确")
@@ -306,7 +306,7 @@ public class SysUser extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("userId", getUserId())
                 .append("deptId", getDeptId())
-                .append("userName", getUserName())
+                .append("usernameOrEmail", getUserName())
                 .append("nickName", getNickName())
                 .append("email", getEmail())
                 .append("phonenumber", getPhonenumber())
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
index 8ede754..b642a16 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,6 +1,5 @@
 package com.muyu.system.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.system.domain.LoginUser;
 import com.muyu.system.domain.SysUserOnline;
@@ -40,7 +39,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
      */
     @Override
     public SysUserOnline selectOnlineByUserName (String userName, LoginUser user) {
-        if (StringUtils.equals(userName, user.getUsername())) {
+        if (StringUtils.equals(userName, user.getUsernameOrEmail())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -57,7 +56,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
      */
     @Override
     public SysUserOnline selectOnlineByInfo (String ipaddr, String userName, LoginUser user) {
-        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
+        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsernameOrEmail())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -77,7 +76,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
         }
         SysUserOnline sysUserOnline = new SysUserOnline();
         sysUserOnline.setTokenId(user.getToken());
-        sysUserOnline.setUserName(user.getUsername());
+        sysUserOnline.setUserName(user.getUsernameOrEmail());
         sysUserOnline.setIpaddr(user.getIpaddr());
         sysUserOnline.setLoginTime(user.getLoginTime());
         return sysUserOnline;
diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
index e5f3cf5..f1ed946 100644
--- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -7,7 +7,7 @@
     <resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
-        <result property="userName" column="user_name"/>
+        <result property="usernameOrEmail" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
@@ -91,8 +91,8 @@
         <if test="userId != null and userId != 0">
             AND u.user_id = #{userId}
         </if>
-        <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">
+            AND u.user_name like concat('%', #{usernameOrEmail}, '%')
         </if>
         <if test="status != null and status != ''">
             AND u.status = #{status}
@@ -121,8 +121,8 @@
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0' and r.role_id = #{roleId}
-        <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">
+            AND u.user_name like concat('%', #{usernameOrEmail}, '%')
         </if>
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -140,8 +140,8 @@
         where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
         and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
         ur.role_id = #{roleId})
-        <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">
+            AND u.user_name like concat('%', #{usernameOrEmail}, '%')
         </if>
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -163,7 +163,7 @@
     <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
         select user_id, user_name
         from sys_user
-        where user_name = #{userName}
+        where user_name = #{usernameOrEmail}
           and del_flag = '0'
             limit 1
     </select>
@@ -188,7 +188,7 @@
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>
         <if test="deptId != null and deptId != 0">dept_id,</if>
-        <if test="userName != null and userName != ''">user_name,</if>
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">user_name,</if>
         <if test="nickName != null and nickName != ''">nick_name,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="avatar != null and avatar != ''">avatar,</if>
@@ -202,7 +202,7 @@
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
-        <if test="userName != null and userName != ''">#{userName},</if>
+        <if test="usernameOrEmail != null and usernameOrEmail != ''">#{usernameOrEmail},</if>
         <if test="nickName != null and nickName != ''">#{nickName},</if>
         <if test="email != null and email != ''">#{email},</if>
         <if test="avatar != null and avatar != ''">#{avatar},</if>
@@ -220,7 +220,7 @@
         update sys_user
         <set>
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
-            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="usernameOrEmail != null and usernameOrEmail != ''">user_name = #{usernameOrEmail},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="email != null ">email = #{email},</if>
             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
@@ -246,13 +246,13 @@
     <update id="updateUserAvatar" parameterType="com.muyu.common.system.domain.SysUser">
         update sys_user
         set avatar = #{avatar}
-        where user_name = #{userName}
+        where user_name = #{usernameOrEmail}
     </update>
 
     <update id="resetUserPwd" parameterType="com.muyu.common.system.domain.SysUser">
         update sys_user
         set password = #{password}
-        where user_name = #{userName}
+        where user_name = #{usernameOrEmail}
     </update>
 
     <delete id="deleteUserById" parameterType="Long">