From 51a558d690e6092a9e48801a6f83e50e3d6b7ce3 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 16 三月 2023 18:11:00 +0800 Subject: [PATCH] fix 修复 代码生成 点选按钮不生效问题 --- ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm | 32 ++++++++++++-------------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 1989e06..e4bba01 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -1,21 +1,18 @@ package ${packageName}.domain.bo; +import ${packageName}.domain.${ClassName}; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; - -import java.util.Date; - #foreach ($import in $importList) import ${import}; #end -#if($table.crud || $table.sub) -import com.ruoyi.common.mybatis.core.domain.BaseEntity; -#elseif($table.tree) -import com.ruoyi.common.mybatis.core.domain.TreeEntity; -#end + +import java.util.Date; /** * ${functionName}涓氬姟瀵硅薄 ${tableName} @@ -23,29 +20,24 @@ * @author ${author} * @date ${datetime} */ -#if($table.crud || $table.sub) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity<${ClassName}Bo>") -#end - @Data @EqualsAndHashCode(callSuper = true) -public class ${ClassName}Bo extends ${Entity} { +@AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false) +public class ${ClassName}Bo extends BaseEntity { #foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.isInsert || $column.isEdit)) +#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) /** * $column.columnComment */ -#if($column.isInsert && $column.isEdit) +#if($column.insert && $column.edit) #set($Group="AddGroup.class, EditGroup.class") -#elseif($column.isInsert) +#elseif($column.insert) #set($Group="AddGroup.class") -#elseif($column.isEdit) +#elseif($column.edit) #set($Group="EditGroup.class") #end -#if($column.isRequired == 1) +#if($column.required) #if($column.javaType == 'String') @NotBlank(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group }) #else -- Gitblit v1.9.3