From 92dfee02752fd6bcc5c7e45c4a8b5b6efdf57919 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 27 三月 2023 16:52:44 +0800 Subject: [PATCH] !315 update 优化BaseMapperPlus接口 去除 `@param <M> Mapper` 泛型(已无用处) Merge pull request !315 from Bleachtred/5.X --- ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm | 13 +++++++------ 1 files changed, 7 insertions(+), 6 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 0867769..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,11 +1,12 @@ 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 io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.*; #foreach ($import in $importList) import ${import}; @@ -25,18 +26,18 @@ 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