From 3706d2e1db45e64a1375b92300901de39e35e464 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 25 一月 2022 21:50:54 +0800 Subject: [PATCH] update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 --- ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 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 6fd4695..2cf259c 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -3,43 +3,52 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; -import java.util.Map; -import java.util.HashMap; 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; + private static final long serialVersionUID=1L; #foreach ($column in $columns) - - /** $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(!$table.isSuperColumn($column.javaField)) + /** + * $column.columnComment + */ #if($column.javaField=='delFlag') @TableLogic +#end +#if($column.javaField=='version') + @Version #end #if($column.isPk==1) @TableId(value = "$column.columnName") #end private $column.javaType $column.javaField; #end +#end } -- Gitblit v1.9.3