From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:22:30 +0800
Subject: [PATCH] update 适配 新序列化注解
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 29a4f23..1fdc913 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -2,11 +2,20 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
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}
@@ -14,25 +23,24 @@
* @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)
+@EqualsAndHashCode(callSuper = true)
@TableName("${tableName}")
-public class ${ClassName} implements Serializable {
+public class ${ClassName} extends ${Entity} {
- private static final long serialVersionUID=1L;
+ @Serial
+ 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 +52,6 @@
#end
private $column.javaType $column.javaField;
#end
+#end
}
--
Gitblit v1.9.3