From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 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 028b1ea..b06144c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -1,19 +1,13 @@
package ${packageName}.domain;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
-import com.ruoyi.common.annotation.Excel;
-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;
+import com.ruoyi.common.annotation.Excel;
/**
* ${functionName}瀵硅薄 ${tableName}
@@ -32,30 +26,19 @@
#foreach ($column in $columns)
/** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
+#if($column.javaField=="createBy"||$column.javaField=="createTime")
+ @TableField(fill = FieldFill.INSERT)
#end
-#if($parentheseIndex != -1)
- @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
- @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#else
- @Excel(name = "${comment}")
+#if($column.javaField=="updateBy"||$column.javaField=="updateTime")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
#end
+#if($column.javaField=='delFlag')
+ @TableLogic
#end
#if($column.isPk==1)
@TableId(value = "$column.columnName")
- private $column.javaType $column.javaField;
-#else
- private $column.javaType $column.javaField;
#end
+ private $column.javaType $column.javaField;
#end
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3