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-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 860f2f2..fcf2e4a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -4,14 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.TreeEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 /**
@@ -22,23 +21,22 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_dept")
-@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
-public class SysDept extends TreeEntity {
+@Schema(name = "閮ㄩ棬涓氬姟瀵硅薄")
+public class SysDept extends TreeEntity<SysDept> {
     private static final long serialVersionUID = 1L;
 
     /**
      * 閮ㄩ棬ID
      */
-    @ApiModelProperty(value = "閮ㄩ棬id")
+    @Schema(name = "閮ㄩ棬id")
     @TableId(value = "dept_id")
     private Long deptId;
 
     /**
      * 閮ㄩ棬鍚嶇О
      */
-    @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+    @Schema(name = "閮ㄩ棬鍚嶇О")
     @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
     private String deptName;
@@ -46,27 +44,27 @@
     /**
      * 鏄剧ず椤哄簭
      */
-    @ApiModelProperty(value = "鏄剧ず椤哄簭")
-    @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
-    private String orderNum;
+    @Schema(name = "鏄剧ず椤哄簭")
+    @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+    private Integer orderNum;
 
     /**
      * 璐熻矗浜�
      */
-    @ApiModelProperty(value = "璐熻矗浜�")
+    @Schema(name = "璐熻矗浜�")
     private String leader;
 
     /**
      * 鑱旂郴鐢佃瘽
      */
-    @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+    @Schema(name = "鑱旂郴鐢佃瘽")
     @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
     private String phone;
 
     /**
      * 閭
      */
-    @ApiModelProperty(value = "閭")
+    @Schema(name = "閭")
     @Email(message = "閭鏍煎紡涓嶆纭�")
     @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
     private String email;
@@ -74,20 +72,20 @@
     /**
      * 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
      */
-    @ApiModelProperty(value = "閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
+    @Schema(name = "閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
     private String status;
 
     /**
      * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
      */
-    @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
+    @Schema(name = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
     @TableLogic
     private String delFlag;
 
     /**
      * 绁栫骇鍒楄〃
      */
-    @ApiModelProperty(value = "绁栫骇鍒楄〃")
+    @Schema(name = "绁栫骇鍒楄〃")
     private String ancestors;
 
 }

--
Gitblit v1.9.3