解决冲突

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java

@@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * @Description : 用户登录记录
@@ -32,19 +31,19 @@ public class SysLogUserLogin extends BaseBean {
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , access ="用户ID")
     private Long userId;
- 
+
     @Column(name="LOG_LOGIN_NAME")
     @ApiParam(value ="登录名称" , access ="登录名称")
     private String logLoginName;
- 
+
     @Column(name="LOG_LOGIN_STATUS")
     @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1")
     private Integer logLoginStatus;
- 
+
     @Column(name="LOG_LOGIN_PLATFORM")
     @ApiParam(value ="登录平台ID（枚举）" , example ="1")
     private Integer logLoginPlatform;
- 
+
     @Column(name="LOG_LOGIN_HOST")
     @ApiParam(value ="登录IP" , access ="登录IP")
     private String logLoginHost;
@@ -52,7 +51,7 @@ public class SysLogUserLogin extends BaseBean {
     @Column(name="LOG_LOGIN_BROWSER")
     @ApiParam(value ="登录浏览器" , access ="登录的浏览器")
     private String logLoginBrowser;
- 
+
     @Column(name="LOG_LOGIN_DATE_TIME")
     @ApiParam(value ="登录时间" , access ="登录时间")
     private String logLoginDateTime;