From 4c57c2a04408fb8f9c0c08cf8d1919c76a90658c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 四月 2022 11:50:16 +0800
Subject: [PATCH] update springboot-admin 2.6.5 => 2.6.6 update qiniu 7.9.3 => 7.9.5 update qcloud 5.6.68 => 5.6.72 update minio 8.3.7 => 8.3.8 update okhttp 4.9.2 => 4.9.3
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 b06144c..8fde4ad 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -3,42 +3,52 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
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}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
+#if($table.crud || $table.sub)
+ #set($Entity="BaseEntity")
+#elseif($table.tree)
+ #set($Entity="TreeEntity<${ClassName}>")
+#end
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
@TableName("${tableName}")
-public class ${ClassName} implements Serializable {
+public class ${ClassName} extends ${Entity} {
-private static final long serialVersionUID=1L;
+ 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
+#if($column.javaField=='version')
+ @Version
#end
#if($column.isPk==1)
@TableId(value = "$column.columnName")
#end
private $column.javaType $column.javaField;
#end
+#end
}
--
Gitblit v1.9.3