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 29a4f23c7..dfd1465f6 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -8,31 +8,38 @@ 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} * * @author ${author} * @date ${datetime} */ +#if($table.crud || $table.sub) + #set($Entity="BaseEntity") +#elseif($table.tree) + #set($Entity="TreeEntity") +#end @Data -@NoArgsConstructor @Accessors(chain = 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 +51,6 @@ public class ${ClassName} implements Serializable { #end private $column.javaType $column.javaField; #end +#end }