From 5b34772c7edb28bcd1ca8db5a65a9ff9199f369d Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 20 Apr 2017 10:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/cm/controller/LoginController.java | 3 --- 1 file changed, 3 deletions(-) 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; -- 1.8.3.1