diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
index 52ca6ea..5ef12ab 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
@@ -20,11 +20,8 @@ import com.lyms.base.common.entity.role.TreeNode;
 import com.lyms.base.common.entity.user.Users;
 import com.lyms.base.common.enums.PermissionEnum;
 import com.lyms.base.common.service.role.PermissionsService;
-<<<<<<< Updated upstream
 import com.lyms.base.common.service.user.UsersService;
 import com.lyms.cm.controller.sys.SysUsersController;
-=======
->>>>>>> Stashed changes
 import com.lyms.constants.Constants;
 import com.lyms.shiro.ShiroWebUtils;
 import com.lyms.util.StrUtils;