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 f6575ac2..b172b52b 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
@@ -1,32 +1,41 @@
-<#if po.fieldDbType=='Blob'>
-    private transient java.lang.String ${po.fieldName}String;
-
-    private byte[] ${po.fieldName};
-
-    public byte[] get${po.fieldName?cap_first}(){
-        if(${po.fieldName}String==null){
-            return null;
-        }
-        try {
-            return ${po.fieldName}String.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public String get${po.fieldName?cap_first}String(){
-        if(${po.fieldName}==null || ${po.fieldName}.length==0){
-            return "";
-        }
-        try {
-            return new String(${po.fieldName},"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-<#else>
-    @ApiModelProperty(value = "${po.filedComment}")
-    private ${po.fieldType} ${po.fieldName};
+<#if po.fieldDbType=='Blob'>
+    private transient java.lang.String ${po.fieldName}String;
+
+    private byte[] ${po.fieldName};
+
+    public byte[] get${po.fieldName?cap_first}(){
+        if(${po.fieldName}String==null){
+            return null;
+        }
+        try {
+            return ${po.fieldName}String.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String get${po.fieldName?cap_first}String(){
+        if(${po.fieldName}==null || ${po.fieldName}.length==0){
+            return "";
+        }
+        try {
+            return new String(${po.fieldName},"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+<#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};
+        </#if>
+        <#else>
+            private ${po.fieldType} ${po.fieldName};
+    </#if>
+
 </#if>
\ 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 6c789c4c..bd65ad16 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
@@ -1,85 +1,84 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jero-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${tableName}")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
-public class ${entityName} implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']>
-    <#list originalColumns as po>
-    <#-- 生成字典Code -->
-    <#assign list_field_dictCode="">
-    <#if po.classType='sel_user'>
-      <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'>
-    <#elseif po.classType='sel_depart'>
-      <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'>
-    <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'>
-      <#if po.dictTable?default("")?trim?length gt 1>
-        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
-      <#elseif po.dictField?default("")?trim?length gt 1>
-        <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
-      </#if>
-    </#if>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ASSIGN_ID)
-	<#else>
-  		<#if po.fieldDbType =='Date'>
-			<#if po.classType=='date'>
-    <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
-	</#if>
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @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})
-	</#if>
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-			</#if>
-		<#else>
-    <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15${list_field_dictCode})
-	</#if>
-  		</#if>
-      <#if list_field_dictCode?length gt 1>
-	@Dict(${list_field_dictCode?substring(2)})
-      </#if>
-  		<#--  <#if po.classType!='popup'>
-  			<#if po.dictTable?default("")?trim?length gt 1>
-  	@Dict(dicCode="${po.dictField}",dicText="${po.dictText}",dictTable="${po.dictTable}")
-  			<#elseif po.dictField?default("")?trim?length gt 1>
-  	@Dict(dicCode="${po.dictField}")
-  			</#if>
-  		</#if>-->
-    </#if>
-    <#include "/common/blob.ftl">
-	</#list>
-}
+package ${bussiPackage}.${entityPackage}.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: ${tableVo.ftlDescription}
+ * @Author: jero-boot
+ * @Date:   ${.now?string["yyyy-MM-dd"]}
+ * @Version: V1.0
+ */
+@Data
+@TableName("${tableName}")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+public class ${entityName} implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    <#assign excel_ignore_arr=['createBy','createTime','updateBy','updateTime','sysOrgCode']>
+    <#list originalColumns as po>
+    <#-- 生成字典Code -->
+    <#assign list_field_dictCode="">
+    <#if po.classType='sel_user'>
+      <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'>
+    <#elseif po.classType='sel_depart'>
+      <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'>
+    <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'>
+      <#if po.dictTable?default("")?trim?length gt 1>
+        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
+      <#elseif po.dictField?default("")?trim?length gt 1>
+        <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
+      </#if>
+    </#if>
+	/**${po.filedComment}*/
+	<#if po.fieldName == primaryKeyField>
+	@TableId(type = IdType.ASSIGN_ID)
+	<#else>
+  		<#if po.fieldDbType =='Date'>
+			<#if po.classType=='date'>
+    <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	</#if>
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @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})
+	</#if>
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+			</#if>
+		<#else>
+    <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
+	@Excel(name = "${po.filedComment}", width = 15${list_field_dictCode})
+	</#if>
+  		</#if>
+      <#if list_field_dictCode?length gt 1>
+	@Dict(${list_field_dictCode?substring(2)})
+      </#if>
+  		<#--  <#if po.classType!='popup'>
+  			<#if po.dictTable?default("")?trim?length gt 1>
+  	@Dict(dicCode="${po.dictField}",dicText="${po.dictText}",dictTable="${po.dictTable}")
+  			<#elseif po.dictField?default("")?trim?length gt 1>
+  	@Dict(dicCode="${po.dictField}")
+  			</#if>
+  		</#if>-->
+    </#if>
+    <#include "/common/blob.ftl">
+	</#list>
+}
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
index 16f3d653..bea02f76 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
@@ -1,5 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper">
+<resultMap id="${entityName}ResultMap" type="${bussiPackage}.${entityPackage}.entity.${entityName}">
+    <#list originalColumns as field>
+    <#if field.fieldDbName=="id">
+    <id column="${field.fieldDbName}" property="${field.fieldName}" />
+    <#else>
+    <result column="${field.fieldDbName}" property="${field.fieldName}" />
+    </#if>
+    </#list>
+
+</resultMap>
 </mapper>
\ No newline at end of file