From 6687efd887672a80db996d186922868888c67139 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 24 二月 2020 09:56:22 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue --- ruoyi/src/main/resources/vm/java/domain.java.vm | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm index 0ea5a60..76c60df 100644 --- a/ruoyi/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi/src/main/resources/vm/java/domain.java.vm @@ -12,6 +12,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import java.io.Serializable; import java.util.Date; +#if($table.crud) +import com.ruoyi.framework.web.domain.BaseEntity; +#elseif($table.tree) +import com.ruoyi.framework.web.domain.TreeEntity; +#end #foreach ($import in $importList) import ${import}; #end @@ -22,6 +27,11 @@ * @author ${author} * @date ${datetime} */ +#if($table.crud) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end @Data @ToString @EqualsAndHashCode @@ -54,6 +64,13 @@ #if($column.isPk==1) @TableId(value = "$column.columnName", type = IdType.AUTO) private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) #else private $column.javaType $column.javaField; #end -- Gitblit v1.9.3