From 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 05 三月 2024 14:34:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java index 722efb5..a9025e9 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java @@ -95,9 +95,9 @@ @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 validTime; @ApiModelProperty(value = "鎵瑰崟鍙�") -- Gitblit v1.9.3