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/SysDictType.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 942c2f9..095aba0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -7,11 +7,9 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -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.NotBlank; import javax.validation.constraints.Pattern; @@ -27,13 +25,13 @@ @EqualsAndHashCode(callSuper = true) @TableName("sys_dict_type") @ExcelIgnoreUnannotated -@ApiModel("瀛楀吀绫诲瀷涓氬姟瀵硅薄") +@Schema(name = "瀛楀吀绫诲瀷涓氬姟瀵硅薄") public class SysDictType extends BaseEntity { /** * 瀛楀吀涓婚敭 */ - @ApiModelProperty(value = "瀛楀吀涓婚敭") + @Schema(name = "瀛楀吀涓婚敭") @ExcelProperty(value = "瀛楀吀涓婚敭") @TableId(value = "dict_id") private Long dictId; @@ -41,7 +39,7 @@ /** * 瀛楀吀鍚嶇О */ - @ApiModelProperty(value = "瀛楀吀鍚嶇О") + @Schema(name = "瀛楀吀鍚嶇О") @ExcelProperty(value = "瀛楀吀鍚嶇О") @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�") @@ -50,7 +48,7 @@ /** * 瀛楀吀绫诲瀷 */ - @ApiModelProperty(value = "瀛楀吀绫诲瀷") + @Schema(name = "瀛楀吀绫诲瀷") @ExcelProperty(value = "瀛楀吀绫诲瀷") @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�") @@ -60,7 +58,7 @@ /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ - @ApiModelProperty(value = "鐘舵�侊紙0姝e父 1鍋滅敤锛�") + @Schema(name = "鐘舵�侊紙0姝e父 1鍋滅敤锛�") @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_normal_disable") private String status; @@ -68,7 +66,7 @@ /** * 澶囨敞 */ - @ApiModelProperty(value = "澶囨敞") + @Schema(name = "澶囨敞") private String remark; } -- Gitblit v1.9.3