From f1a4b363c60b9592b1b8807274c35233b1187928 Mon Sep 17 00:00:00 2001
From: 梁剑锋 <1822213252@qq.com>
Date: 星期二, 23 八月 2022 16:16:23 +0800
Subject: [PATCH] !219 修复点击删除后再点取消控制台报错 * 修复点击删除后再点取消控制台报错，并修改样式 * 修复取消控制台报错
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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..28ca34c 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,19 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import lombok.EqualsAndHashCode;
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 +22,23 @@
* @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;
#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 +50,6 @@
#end
private $column.javaType $column.javaField;
#end
+#end
}
--
Gitblit v1.9.3