From 684eadbcc63b369c9ae2e494fb5890fc62245e82 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 11 一月 2021 09:58:41 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 18 +++++++-----------
1 files changed, 7 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 022a1ef..9e9dd4b 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -10,14 +10,12 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
import java.math.BigDecimal;
-#if($table.crud)
-import com.ruoyi.common.core.domain.BaseEntity;
-#elseif($table.tree)
-import com.ruoyi.common.core.domain.TreeEntity;
-#end
/**
* ${functionName}瀵硅薄 ${tableName}
@@ -25,11 +23,6 @@
* @author ${author}
* @date ${datetime}
*/
-#if($table.crud)
-#set($Entity="BaseEntity")
-#elseif($table.tree)
-#set($Entity="TreeEntity")
-#end
@Data
@ToString
@EqualsAndHashCode
@@ -60,10 +53,13 @@
#end
#end
#if($column.isPk==1)
- @TableId(value = "$column.columnName", type = IdType.AUTO)
+ @TableId(value = "$column.columnName")
private $column.javaType $column.javaField;
#else
private $column.javaType $column.javaField;
#end
#end
+
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3