diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index e3b0a4d63..66503982c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -14,11 +14,7 @@ import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallUserInfoService; import com.iformall.service.MallUserRoleService; import com.iformall.shiro.UserSession; -<<<<<<< HEAD -import com.iformall.utils.IPUtil; -======= import com.iformall.shiro.UseriFormallToken; ->>>>>>> [ADMIN端领导免密登录][移动塔台]:领导手机授权免密登录 import com.iformall.utils.ShiroUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,13 +28,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.imageio.ImageIO; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException;