productDev/dmMes.git

			@@ -33,14 +33,25 @@
			@ExcelColumn(name="来源", valueMapping = "0=PC平台;1=钉钉平台;2=羚羊平台;3=EDGP平台;4=微信小程序",width = 6,align = HorizontalAlignment.CENTER)
			private Integer orgin;
			@ApiModelProperty(value = "企业用户编码", example = "1")
			@ExcelColumn(name="企业用户ID", width = 6)
			private Integer companyUserId;

			@ApiModelProperty(value = "企业名称")
			@ExcelColumn(name="企业名称", width = 16)
			@TableField(exist = false)
			private String companyName;

			@ApiModelProperty(value = "企业用户名称")
			@ExcelColumn(name="企业用户名称", width = 16)
			@TableField(exist = false)
			private String companyUserName;

			@ApiModelProperty(value = "登录用户名")
			@ExcelColumn(name="登录用户名")
			private String loginUsername;

			@ApiModelProperty(value = "登录IP")
			@ExcelColumn(name="登录IP", color = IndexedColors.RED, width = 8)
			@ExcelColumn(name="登录IP", width = 8)
			private String ip;

			@ApiModelProperty(value = "登录地址")
			@@ -68,24 +79,14 @@
			private String serverIp;

			@ApiModelProperty(value = "是否登录成功")
			@ExcelColumn(name="是否登录成功", valueMapping = "true=是;false=否", align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="是否成功", valueMapping = "true=成功;false=失败", align = HorizontalAlignment.CENTER)
			private Boolean success;

			@ApiModelProperty(value = "失败原因")
			@ExcelColumn(name="失败原因", color = IndexedColors.RED, width = 16)
			@ExcelColumn(name="失败原因", width = 16)
			private String reason;

			@ApiModelProperty(value = "登录时间")
			@ExcelColumn(name="登录时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
			private Date loginTime;
			@ApiModelProperty(value = "企业名称")
			@ExcelColumn(name="企业名称", color = IndexedColors.RED, width = 16)
			@TableField(exist = false)
			private String companyName;

			@ApiModelProperty(value = "企业用户名称")
			@ExcelColumn(name="企业名称", color = IndexedColors.RED, width = 16)
			@TableField(exist = false)
			private String companyUserName;

			}