diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java
index 63254e7e..d788e344 100644
--- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java
+++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java
@@ -36,9 +36,9 @@ public class AdminController {
     public ApiResult<SaTokenInfo> login(String userName, String password) {
         AdminUser user=adminUserService.getUser(userName,password);
         VUtils.trueThrow(Objects.isNull(user)).throwMessage(STATE.PassportErr,"用户名或密码错误");
-        VUtils.trueThrow(user.getState()==-1).throwMessage(STATE.PassportErr,"用户被冻结，请联系管理员");
+        VUtils.trueThrow(!user.getEnable()).throwMessage(STATE.PassportErr, "用户被禁用，请联系管理员");
         SaTokenAdminUtil.login(user.getId(), SaLoginConfig
-                .setExtra("name", user.getName()));
+                .setExtra("name", user.getUserName()));
         return ApiResult.success(SaTokenAdminUtil.getTokenInfo());
     }
 
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java
index 561d8fd7..0d597219 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java
@@ -1,7 +1,9 @@
 package com.nflg.mobilebroken.common.pojo.request;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = false)
 @Data
 public class ConfigUpdateRequest extends ConfigAddRequest {
 
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java
index 89642f1b..2ec6ea5d 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java
@@ -1,7 +1,9 @@
 package com.nflg.mobilebroken.common.pojo.request;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = false)
 @Data
 public class SearchMenuButtonRequest extends PageRequest {
 
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
index 201618a2..74cd632b 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
@@ -8,6 +8,7 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java
index 9aa20317..0b396eec 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java
@@ -1,6 +1,12 @@
 package com.nflg.mobilebroken.repository.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
 import com.nflg.mobilebroken.repository.entity.TBasePosition;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,7 +19,7 @@ import com.nflg.mobilebroken.repository.entity.TBasePosition;
 public interface TBasePositionMapper extends BaseMapper<TBasePosition> {
 
 
-    Page<TBasePosition> getList(@Param("page")Page<PageBaseQuery> page,@Param("query") PageBaseQuery query);
+    Page<TBasePosition> getList(@Param("page") Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
 
-    void delByIds(@Param("ids")List<Integer> ids);
+    void delByIds(@Param("ids") List<Integer> ids);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
index 8e1189b6..966c97c3 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
@@ -25,7 +25,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     public AdminUser getUser(String userName, String password) {
         String encodePassword= PASSWORDENCODER.encode(password);
         return lambdaQuery()
-                .eq(AdminUser::getCode, userName)
+                .eq(AdminUser::getLoginName, userName)
                 .eq(AdminUser::getPassword, encodePassword)
                 .one();
     }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ParamConfigServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ParamConfigServiceImpl.java
index e26f2e94..c56efccd 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ParamConfigServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ParamConfigServiceImpl.java
@@ -77,7 +77,7 @@ public class ParamConfigServiceImpl extends ServiceImpl<ParamConfigMapper, Param
             if (Objects.isNull(createUserName)) {
                 AdminUser au = adminUserService.getById(d.getCreateBy());
                 if (Objects.nonNull(au)) {
-                    createUserName = au.getName();
+                    createUserName = au.getUserName();
                     userMap.put(d.getCreateBy(), createUserName);
                 }
             }
@@ -85,7 +85,7 @@ public class ParamConfigServiceImpl extends ServiceImpl<ParamConfigMapper, Param
             if (Objects.isNull(updateUserName)) {
                 AdminUser au = adminUserService.getById(d.getUpdateBy());
                 if (Objects.nonNull(au)) {
-                    updateUserName = au.getName();
+                    updateUserName = au.getUserName();
                     userMap.put(d.getUpdateBy(), updateUserName);
                 }
             }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
index b6c45708..c84822ae 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
@@ -87,7 +87,7 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
             if (Objects.isNull(createUserName)) {
                 AdminUser au = adminUserService.getById(d.getCreateBy());
                 if (Objects.nonNull(au)) {
-                    createUserName = au.getName();
+                    createUserName = au.getUserName();
                     userMap.put(d.getCreateBy(), createUserName);
                 }
             }
@@ -95,7 +95,7 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
             if (Objects.isNull(updateUserName)) {
                 AdminUser au = adminUserService.getById(d.getUpdateBy());
                 if (Objects.nonNull(au)) {
-                    updateUserName = au.getName();
+                    updateUserName = au.getUserName();
                     userMap.put(d.getUpdateBy(), updateUserName);
                 }
             }