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/SysDictData.java | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index c61c917..4b02138 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -8,8 +8,7 @@ import com.ruoyi.common.constant.UserConstants; 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; @@ -26,13 +25,13 @@ @EqualsAndHashCode(callSuper = true) @TableName("sys_dict_data") @ExcelIgnoreUnannotated -@ApiModel("瀛楀吀鏁版嵁涓氬姟瀵硅薄") +@Schema(name = "瀛楀吀鏁版嵁涓氬姟瀵硅薄") public class SysDictData extends BaseEntity { /** * 瀛楀吀缂栫爜 */ - @ApiModelProperty(value = "瀛楀吀缂栫爜") + @Schema(name = "瀛楀吀缂栫爜") @ExcelProperty(value = "瀛楀吀缂栫爜") @TableId(value = "dict_code") private Long dictCode; @@ -40,14 +39,14 @@ /** * 瀛楀吀鎺掑簭 */ - @ApiModelProperty(value = "瀛楀吀鎺掑簭") + @Schema(name = "瀛楀吀鎺掑簭") @ExcelProperty(value = "瀛楀吀鎺掑簭") private Integer dictSort; /** * 瀛楀吀鏍囩 */ - @ApiModelProperty(value = "瀛楀吀鏍囩") + @Schema(name = "瀛楀吀鏍囩") @ExcelProperty(value = "瀛楀吀鏍囩") @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�") @@ -56,7 +55,7 @@ /** * 瀛楀吀閿�� */ - @ApiModelProperty(value = "瀛楀吀閿��") + @Schema(name = "瀛楀吀閿��") @ExcelProperty(value = "瀛楀吀閿��") @NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�") @Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�") @@ -65,7 +64,7 @@ /** * 瀛楀吀绫诲瀷 */ - @ApiModelProperty(value = "瀛楀吀绫诲瀷") + @Schema(name = "瀛楀吀绫诲瀷") @ExcelProperty(value = "瀛楀吀绫诲瀷") @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�") @@ -74,20 +73,20 @@ /** * 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛� */ - @ApiModelProperty(value = "鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�") + @Schema(name = "鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�") @Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�") private String cssClass; /** * 琛ㄦ牸瀛楀吀鏍峰紡 */ - @ApiModelProperty(value = "琛ㄦ牸瀛楀吀鏍峰紡") + @Schema(name = "琛ㄦ牸瀛楀吀鏍峰紡") private String listClass; /** * 鏄惁榛樿锛圷鏄� N鍚︼級 */ - @ApiModelProperty(value = "鏄惁榛樿锛圷鏄� N鍚︼級") + @Schema(name = "鏄惁榛樿锛圷鏄� N鍚︼級") @ExcelProperty(value = "鏄惁榛樿", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_yes_no") private String isDefault; @@ -95,7 +94,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; @@ -103,7 +102,7 @@ /** * 澶囨敞 */ - @ApiModelProperty(value = "澶囨敞") + @Schema(name = "澶囨敞") private String remark; public boolean getDefault() { -- Gitblit v1.9.3