diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
index f7f923a..a3d055d 100644
--- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
+++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
@@ -1,16 +1,15 @@
 package org.agt.module.system.controller.admin.auth.vo;
 
 import cn.hutool.core.util.StrUtil;
-import org.agt.framework.common.validation.InEnum;
-import org.agt.module.system.enums.social.SocialTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.agt.framework.common.validation.InEnum;
+import org.agt.module.system.enums.social.SocialTypeEnum;
 import org.hibernate.validator.constraints.Length;
 
 @Schema(description = "管理后台 - 账号密码登录 Request VO，如果登录并绑定社交用户，需要传递 social 开头的参数")
@@ -22,8 +21,8 @@ public class AuthLoginReqVO extends CaptchaVerificationReqVO {
 
     @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "agtyuanma")
     @NotEmpty(message = "登录账号不能为空")
-    @Length(min = 4, max = 16, message = "账号长度为 4-16 位")
-    @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
+//    @Length(min = 4, max = 16, message = "账号长度为 4-16 位")
+//    @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
     private String username;
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java
index 6aeaf52..4947320 100644
--- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java
+++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java
@@ -1,5 +1,6 @@
 package org.agt.module.system.dal.mysql.user;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.agt.framework.common.pojo.PageResult;
 import org.agt.framework.mybatis.core.mapper.BaseMapperX;
 import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -14,7 +15,7 @@ import java.util.List;
 public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
 
     default AdminUserDO selectByUsername(String username) {
-        return selectOne(AdminUserDO::getUsername, username);
+        return selectOne(Wrappers.<AdminUserDO>lambdaQuery().eq(AdminUserDO::getUsername, username).or().eq(AdminUserDO::getEmail, username));
     }
 
     default AdminUserDO selectByEmail(String email) {