From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 02 二月 2024 17:26:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java index 9f49c29..69961ec 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java @@ -71,26 +71,26 @@ @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥姝㈡湡") @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥姝㈡湡") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern="yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern="yyyy-MM-dd") private Date applyEndTime; @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡") @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern="yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern="yyyy-MM-dd") private Date applyStartTime; @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡") @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern="yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern="yyyy-MM-dd") private Date endTime; @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡") @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern="yyyy-MM-dd") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern="yyyy-MM-dd") private Date startTime; @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�") -- Gitblit v1.9.3