From 4e6f47d50abff5d33f622a641b4534ca3dc28b20 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期日, 22 五月 2022 14:13:53 +0800 Subject: [PATCH] update springboot 2.6.7 => 2.6.8 --- ruoyi-generator/src/main/resources/vm/java/bo.java.vm | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 40174d5..13b9873 100644 --- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -28,7 +28,7 @@ #if($table.crud || $table.sub) #set($Entity="BaseEntity") #elseif($table.tree) -#set($Entity="TreeEntity") +#set($Entity="TreeEntity<${ClassName}Bo>") #end @Data @@ -41,7 +41,6 @@ /** * $column.columnComment */ - @ApiModelProperty("$column.columnComment") #if($column.isInsert && $column.isEdit) #set($Group="AddGroup.class, EditGroup.class") #elseif($column.isInsert) @@ -50,39 +49,18 @@ #set($Group="EditGroup.class") #end #if($column.isRequired == 1) + @ApiModelProperty(value = "$column.columnComment", required = true) #if($column.javaType == 'String') @NotBlank(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group }) #else @NotNull(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group }) #end +#else + @ApiModelProperty(value = "$column.columnComment") #end private $column.javaType $column.javaField; #end #end - - /** - * 鍒嗛〉澶у皬 - */ - @ApiModelProperty("鍒嗛〉澶у皬") - private Integer pageSize; - - /** - * 褰撳墠椤垫暟 - */ - @ApiModelProperty("褰撳墠椤垫暟") - private Integer pageNum; - - /** - * 鎺掑簭鍒� - */ - @ApiModelProperty("鎺掑簭鍒�") - private String orderByColumn; - - /** - * 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc - */ - @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc") - private String isAsc; } -- Gitblit v1.9.3