Merge remote-tracking branch 'origin/branch_20190822' into branch_20190822

This commit is contained in:
lai_kd
2019-09-03 18:31:26 +08:00
@@ -33,9 +33,9 @@ public class ${domainObjectName}DO extends BaseDO {
public void set${column.name?cap_first}(${column.javaType} ${column.name}) {
<#if column.javaType == "String">
this.${column.name} = ${column.name} == null ? "" : ${column.name}.trim();
this.${column.name} = ${column.name};
<#else>
this.${column.name} = ${column.name} == null ? ${column.javaType}.valueOf(0) : ${column.name};
this.${column.name} = ${column.name};
</#if>
}
</#if>