From 8a8706ab004f04d11ec11daef67e8eac63404310 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Mon, 8 Nov 2021 23:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/code-template-online/common/blob.ftl | 11 +---------- .../${entityPackage}/entity/${entityName}.javai | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl index b172b52b..fd63b325 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl +++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl @@ -28,14 +28,5 @@ } <#else> @ApiModelProperty(value = "${po.filedComment}") - <#if po.fieldDbType=="Date"> - <#if po.classType=="date"> - private java.time.LocalDate ${po.fieldName}; - <#else> - private java.time.LocalDateTime ${po.fieldName}; - - <#else> - private ${po.fieldType} ${po.fieldName}; - - + private ${po.fieldType} ${po.fieldName}; \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index afca4691..d9d06a4c 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -57,14 +57,12 @@ public class ${entityName} implements Serializable { @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode}) @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @JsonSerialize(using = com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer.class) @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode}) @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @JsonSerialize(using = com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer.class) @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") <#else>