From b230858cc0d2ee4fdb177c91c4e11cdf3dd57364 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 07:15:33 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
index cb97ea6..4554ab8 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
@@ -3,13 +3,13 @@
import java.io.Serializable;
<#if hasDate = true>
import java.util.Date;
- import cc.mrbird.febs.common.core.annotation.FieldInfo;
- import cc.mrbird.febs.common.core.utils.DateDeSerializer;
- import cc.mrbird.febs.common.core.utils.DateSerializer;
- import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
- import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
- import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
- import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
</#if>
<#if hasBigDecimal = true>
import java.math.BigDecimal;
@@ -45,7 +45,7 @@
<#if (column.type = 'varchar' || column.type = 'text' || column.type = 'uniqueidentifier'
|| column.type = 'varchar2' || column.type = 'nvarchar' || column.type = 'VARCHAR2'
|| column.type = 'VARCHAR'|| column.type = 'CLOB' || column.type = 'char')>
- private String ${column.field?uncap_first};
+ private String ${column.field?uncap_first}="";
</#if>
<#if column.type = 'timestamp' || column.type = 'datetime'||column.type = 'TIMESTAMP' || column.type = 'DATETIME'>
@@ -66,19 +66,19 @@
<#if column.name = 'version'>
@Version
</#if>
- private Integer ${column.field?uncap_first};
+ private Integer ${column.field?uncap_first}=0;
</#if>
<#if column.type = 'double'>
- private Double ${column.field?uncap_first};
+ private Double ${column.field?uncap_first}=0;
</#if>
<#if column.type = 'bigint'>
- private Long ${column.field?uncap_first};
+ private Long ${column.field?uncap_first}=0L;
</#if>
<#if column.type = 'decimal' || column.type = 'numeric'>
- private BigDecimal ${column.field?uncap_first};
+ private BigDecimal ${column.field?uncap_first}=0;
</#if>
</#list>
--
Gitblit v1.8.0