From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 18:08:14 +0800
Subject: [PATCH] add 整合 springdoc 移除 knife4j

---
 ruoyi-generator/src/main/resources/vm/java/bo.java.vm |   32 +++++---------------------------
 1 files changed, 5 insertions(+), 27 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..0d0af36 100644
--- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
@@ -28,12 +28,12 @@
 #if($table.crud || $table.sub)
 #set($Entity="BaseEntity")
 #elseif($table.tree)
-#set($Entity="TreeEntity")
+#set($Entity="TreeEntity<${ClassName}Bo>")
 #end
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("${functionName}涓氬姟瀵硅薄")
+@Schema(name = "${functionName}涓氬姟瀵硅薄")
 public class ${ClassName}Bo extends ${Entity} {
 
 #foreach ($column in $columns)
@@ -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)
+    @Schema(name = "$column.columnComment", required = true)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group })
 #else
     @NotNull(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group })
 #end
+#else
+    @Schema(name = "$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