productDev/funingyunwei.git

			@@ -32,15 +32,15 @@
			private Integer creator;

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="创建时间",index = 5, dateFormat = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@ExcelColumn(name="创建时间",index = 5, dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			private Integer editor;

			@ApiModelProperty(value = "更新时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date editDate;

			@ApiModelProperty(value = "是否删除0否 1是", example = "1")
			@@ -50,7 +50,7 @@
			private String remark;

			@ApiModelProperty(value = "状态 0正常 1损坏 2报废", example = "1")
			@ExcelColumn(name="设备状态",index = 3, valueMapping = "0=正常;1=损坏;2=报废;")
			@ExcelColumn(name="设备状态",index = 3, valueMapping = "0=正常;1=损坏;2=报废;",width = 10)
			private Integer status;

			@ApiModelProperty(value = "设备型号", example = "1")
			@@ -67,25 +67,25 @@
			private Date company;

			@ApiModelProperty(value = "情况说明")
			@ExcelColumn(name="运维备注",index = 4)
			@ExcelColumn(name="运维备注",index = 4,width = 30)
			private String content;

			@ApiModelProperty(value = "运维时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date dealDate;

			@ApiModelProperty(value = "设备名称")
			@ExcelColumn(name="设备名称",index = 2)
			@ExcelColumn(name="设备名称",index = 2,width = 20)
			@TableField(exist = false)
			private String deviceName;

			@ApiModelProperty(value = "设备编号")
			@ExcelColumn(name="设备编号",index = 1)
			@ExcelColumn(name="设备编号",index = 1,width = 10)
			@TableField(exist = false)
			private String deviceCode;

			@ApiModelProperty(value = "运维人名称")
			@ExcelColumn(name="运维人",index = 0)
			@ExcelColumn(name="运维人",index = 0,width = 10)
			@TableField(exist = false)
			private String realName;