From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 31 一月 2024 09:37:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/dao/business/model/Areas.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Areas.java b/server/service/src/main/java/com/doumee/dao/business/model/Areas.java index f0fbca1..67de20f 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/Areas.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/Areas.java @@ -13,7 +13,7 @@ /** * 鐪佸競鍖轰俊鎭〃 * @author 姹熻箘韫� - * @date 2024/01/15 15:07 + * @date 2024/01/16 10:03 */ @Data @ApiModel("鐪佸競鍖轰俊鎭〃") @@ -31,7 +31,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "缂栬緫浜�", example = "1") @@ -40,7 +40,7 @@ @ApiModelProperty(value = "缂栬緫鏃堕棿") @ExcelColumn(name="缂栬緫鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") -- Gitblit v1.9.3