修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -3,14 +3,20 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.ObjectUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +32,7 @@ public class WaterResourceDto extends BaseDto {
 	@ExcelIgnore
 	@ApiModelProperty(value = "机构/部门名称")
 	private String bizOrgName;
+
 	@ExcelIgnore
 	@ApiModelProperty(value = "机构编码")
 	private String bizOrgCode;
@@ -88,11 +95,15 @@ public class WaterResourceDto extends BaseDto {
 
 	@ExcelProperty(value = "建造日期", index = 7)
 	@ApiModelProperty(value = "建造日期")
-	private Date buildDate;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private String buildDate;
 
 	@ExcelProperty(value = "启用日期", index = 8)
 	@ApiModelProperty(value = "启用日期")
-	private Date enableDate;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private String enableDate;
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "方位图集合")