From b47f8fd7844bfc971846fd6a7b91d7a14fb92933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 15 Oct 2021 16:19:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=E7=94=9F=E6=88=90=E6=8A=BD=E8=B1=A1?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/java/domain.java.vm | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 29a4f23c7..dfd1465f6 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -8,31 +8,38 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
+#foreach ($import in $importList)
+import ${import};
+#end
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
+
 /**
  * ${functionName}对象 ${tableName}
  *
  * @author ${author}
  * @date ${datetime}
  */
+#if($table.crud || $table.sub)
+    #set($Entity="BaseEntity")
+#elseif($table.tree)
+    #set($Entity="TreeEntity")
+#end
 @Data
-@NoArgsConstructor
 @Accessors(chain = true)
 @TableName("${tableName}")
-public class ${ClassName} implements Serializable {
+public class ${ClassName} extends ${Entity} {
 
     private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
-
+#if(!$table.isSuperColumn($column.javaField))
     /**
      * $column.columnComment
      */
-#if($column.javaField=="createBy"||$column.javaField=="createTime")
-    @TableField(fill = FieldFill.INSERT)
-#end
-#if($column.javaField=="updateBy"||$column.javaField=="updateTime")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-#end
 #if($column.javaField=='delFlag')
     @TableLogic
 #end
@@ -44,5 +51,6 @@ public class ${ClassName} implements Serializable {
 #end
     private $column.javaType $column.javaField;
 #end
+#end
 
 }