Commit 5b34772c7edb28bcd1ca8db5a65a9ff9199f369d
1 parent
97cc8a1364
Exists in
master
冲突解决
Showing 1 changed file with 0 additions and 3 deletions
parent/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java
View file @
5b34772
| ... | ... | @@ -20,11 +20,8 @@ |
| 20 | 20 | import com.lyms.base.common.entity.user.Users; |
| 21 | 21 | import com.lyms.base.common.enums.PermissionEnum; |
| 22 | 22 | import com.lyms.base.common.service.role.PermissionsService; |
| 23 | -<<<<<<< Updated upstream | |
| 24 | 23 | import com.lyms.base.common.service.user.UsersService; |
| 25 | 24 | import com.lyms.cm.controller.sys.SysUsersController; |
| 26 | -======= | |
| 27 | ->>>>>>> Stashed changes | |
| 28 | 25 | import com.lyms.constants.Constants; |
| 29 | 26 | import com.lyms.shiro.ShiroWebUtils; |
| 30 | 27 | import com.lyms.util.StrUtils; |