diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java
index d57bb2b6..af81310d 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java
@@ -114,12 +114,17 @@ public class Table {
     }
 
     public List<Column> getColumns() {
-        // 生成字段排序
-        columns.sort(Comparator.comparingInt((Column c) -> c.getProperty().length())
-            .thenComparing(Column::getProperty));
         return columns;
     }
 
+    public List<Column> getSortedColumns() {
+        ArrayList<Column> arrayList = new ArrayList<>(columns);
+        // 生成字段排序
+        arrayList.sort(Comparator.comparingInt((Column c) -> c.getProperty().length())
+            .thenComparing(Column::getProperty));
+        return arrayList;
+    }
+
     public void setColumns(List<Column> columns) {
         this.columns = columns;
     }
diff --git a/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl b/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl
index 018ec960..f7353103 100644
--- a/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl
+++ b/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl
@@ -18,7 +18,7 @@ public class #(tableDefClassName) extends TableDef {
      */
     public static final #(tableDefClassName) #(tableDefConfig.buildFieldName(table.buildEntityClassName() + tableDefConfig.instanceSuffix)) = new #(tableDefClassName)();
 
-#for(column: table.columns)
+#for(column: table.getSortedColumns())
     #(column.buildComment())
     public final QueryColumn #(tableDefConfig.buildFieldName(column.property)) = new QueryColumn(this, "#(column.name)");