From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 一月 2022 13:03:42 +0800
Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5

---
 ruoyi-generator/src/main/resources/vm/java/bo.java.vm |   28 +++-------------------------
 1 files changed, 3 insertions(+), 25 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..94d6050 100644
--- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
@@ -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