diff --git a/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl b/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl
index 42b8c2a..2bd35ce 100644
--- a/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl
+++ b/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl
@@ -50,76 +50,38 @@ public class ${entity} implements Serializable {
     private static final long serialVersionUID = 1L;
 <% } %>
 <% /** -----------BEGIN 字段循环遍历----------- **/ %>
-<% for(field in table.fields) { %>
-    <%
-    var keyPropertyName;
-    if(field.keyFlag) {
-        keyPropertyName = field.propertyName;
-    }
-    %>
+<% for(field in table.fields) { 
+    var keyPropertyName = field.keyFlag ? field.propertyName : null;
+%>
 
-    <% if(isNotEmpty(field.comment)) { %>
-        <% if(swagger2) { %>
-    @Schema(description = "${field.comment}")
-        <% }else{ %>
-    /**
+<% if(isNotEmpty(field.comment)) { %>
+<% if(swagger2) { %>    @Schema(description = "${field.comment}")
+<% }else{ %>    /**
      * ${field.comment}
      */
-        <% } %>
-    <% } %>
-    
-    <% /* 为时间类型字段添加日期格式化注解 */ %>
-    <% if(field.propertyType == 'LocalDateTime') { %>
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    <% } else if(field.propertyType == 'LocalDate') { %>
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    <% } else if(field.propertyType == 'LocalTime') { %>
-    @JsonFormat(pattern = "HH:mm:ss")
-    <% } else if(field.propertyType == 'Date') { %>
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    <% } %>
-    
-    <% /* 主键 */ %>
-    <% if(field.keyFlag) { %>
-        <% if(field.keyIdentityFlag) { %>
-    @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
-        <% } else if(isNotEmpty(idType)) { %>
-    @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
-        <% } else if(field.convert) { %>
-    @TableId("${field.annotationColumnName}")
-        <% } %>
-    <% /* 普通字段 */ %>
-    <% } else if(isNotEmpty(field.fill)) { %>
-        <% if(field.convert){ %>
-    @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
-        <% }else{ %>
-    @TableField(fill = FieldFill.${field.fill})
-        <% } %>
-    <% } else if(field.convert) { %>
-    @TableField("${field.annotationColumnName}")
-    <% } %>
-    <% /* 乐观锁注解 */ %>
-    <% if(versionFieldName!'' == field.name) { %>
-    @Version
-    <% } %>
-    <% /* 逻辑删除注解 */ %>
-    <% if(logicDeleteFieldName!'' == field.name) { %>
-    @TableLogic
-    <% } %>
-    private ${field.propertyType} ${field.propertyName};
+<% } 
+}%><% /* 为时间类型字段添加日期格式化注解并声明字段 */ %><% if(field.propertyType == 'LocalDateTime' || field.propertyType == 'LocalDate' || field.propertyType == 'LocalTime' || field.propertyType == 'Date') { %><% if(field.propertyType == 'LocalDateTime') { %>    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+<% } else if(field.propertyType == 'LocalDate') { %>    @JsonFormat(pattern = "yyyy-MM-dd")
+<% } else if(field.propertyType == 'LocalTime') { %>    @JsonFormat(pattern = "HH:mm:ss")
+<% } else if(field.propertyType == 'Date') { %>    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+<% } %><% } %><% /* 主键 */ %><% if(field.keyFlag) { %><% if(field.keyIdentityFlag) { %>    @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
+<% } else if(isNotEmpty(idType)) { %>    @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
+<% } else if(field.convert) { %>    @TableId("${field.annotationColumnName}")
+<% } %><% /* 普通字段 */ %>
+<% } else if(isNotEmpty(field.fill)) { %><% if(field.convert){ %>    @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
+<% }else{ %>    @TableField(fill = FieldFill.${field.fill})
+<% } %>
+<% } else if(field.convert) { %>    @TableField("${field.annotationColumnName}")
+<% } %><% /* 乐观锁注解 */ %><% if(versionFieldName!'' == field.name) { %>    @Version
+<% } %><% /* 逻辑删除注解 */ %><% if(logicDeleteFieldName!'' == field.name) { %>    @TableLogic
+<% } %>    private ${field.propertyType} ${field.propertyName};
 <% } %>
 <% /** -----------END 字段循环遍历----------- **/ %>
 
 <% if(!entityLombokModel) { %>
-    <% for(field in table.fields) { %>
-        <%
-        var getprefix = '';
-        if(field.propertyType == 'boolean') {
-            getprefix = 'is';
-        } else {
-            getprefix = 'get';
-        }
-        %>
+    <% for(field in table.fields) { 
+        var getprefix = field.propertyType == 'boolean' ? 'is' : 'get';
+    %>
     public ${field.propertyType} ${getprefix}${field.capitalName}() {
         return ${field.propertyName};
     }