productDev/funingyunwei.git

			@@ -75,15 +75,15 @@

			@ApiModelProperty(value = "处理时间")
			@ExcelColumn(name="处理时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date dealDate;

			@ApiModelProperty(value = "是否巡检 0=待开始；1=已巡检；", example = "1")
			@ExcelColumn(name="是否巡检 0=待开始；1=已巡检")
			private Integer status;

			@ApiModelProperty(value = "巡检结果 0=正常；1=异常", example = "1")
			@ExcelColumn(name="巡检结果 0=正常；1=异常")
			@ApiModelProperty(value = "巡检结果 0=正常；1=异常;2=跳过；", example = "1")
			@ExcelColumn(name="巡检结果 0=正常；1=异常；2=跳过；")
			private Integer dealStatus;

			@ApiModelProperty(value = "处理备注")
			@@ -111,9 +111,34 @@
			@TableField(exist = false)
			private String pointCode;

			@ApiModelProperty(value = "设备主键")
			@TableField(exist = false)
			private Integer deviceId;

			@ApiModelProperty(value = "附件列表")
			@TableField(exist = false)
			private List<Multifile> multifileList;


			@ApiModelProperty(value = "巡检计划名称")
			@TableField(exist = false)
			private String schemeTitle;

			@ApiModelProperty(value = "巡检任务编号")
			@TableField(exist = false)
			private String taskCode;

			@ApiModelProperty(value = "开始日期")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date startDate;

			@ApiModelProperty(value = "结束日期")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date endDate;




			}