From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 一月 2022 13:03:42 +0800
Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 b6eca82..dfd1465 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -7,7 +7,15 @@
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
+
+#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}
@@ -15,23 +23,23 @@
* @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)
-
- /** $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(!$table.isSuperColumn($column.javaField))
+ /**
+ * $column.columnComment
+ */
#if($column.javaField=='delFlag')
@TableLogic
#end
@@ -43,5 +51,6 @@
#end
private $column.javaType $column.javaField;
#end
+#end
}
--
Gitblit v1.9.3