事故事件上报修改

 package com.skua.modules.emergency.dto;
 package com.skua.modules.emergency.dto;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
 
 
 /**
 /**
  * 应急风险事件
  * 应急风险事件
@@ -52,9 +47,8 @@ public class EmergencyRiskEventAddDTO {
 	private String reportUser;
 	private String reportUser;
 	/**上报时间*/
 	/**上报时间*/
     @ApiModelProperty(value = "上报时间")
     @ApiModelProperty(value = "上报时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date reportDate;
+	@Excel(name = "上报时间", width = 15)
+	private String reportDate;
 	/**所属厂站*/
 	/**所属厂站*/
 	@Excel(name = "所属厂站", width = 15)
 	@Excel(name = "所属厂站", width = 15)
 	@ApiModelProperty(value = "所属厂站")
 	@ApiModelProperty(value = "所属厂站")