From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:09 +0800
Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java |   21 +++------------------
 1 files changed, 3 insertions(+), 18 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 241aecd..c853125 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,14 +8,11 @@
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * 瀛楀吀鏁版嵁琛� sys_dict_data
@@ -25,16 +22,13 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 @TableName("sys_dict_data")
 @ExcelIgnoreUnannotated
-@ApiModel("瀛楀吀鏁版嵁涓氬姟瀵硅薄")
 public class SysDictData extends BaseEntity {
 
     /**
      * 瀛楀吀缂栫爜
      */
-    @ApiModelProperty(value = "瀛楀吀缂栫爜")
     @ExcelProperty(value = "瀛楀吀缂栫爜")
     @TableId(value = "dict_code")
     private Long dictCode;
@@ -42,14 +36,12 @@
     /**
      * 瀛楀吀鎺掑簭
      */
-    @ApiModelProperty(value = "瀛楀吀鎺掑簭")
     @ExcelProperty(value = "瀛楀吀鎺掑簭")
-    private Long dictSort;
+    private Integer dictSort;
 
     /**
      * 瀛楀吀鏍囩
      */
-    @ApiModelProperty(value = "瀛楀吀鏍囩")
     @ExcelProperty(value = "瀛楀吀鏍囩")
     @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
     @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -58,7 +50,6 @@
     /**
      * 瀛楀吀閿��
      */
-    @ApiModelProperty(value = "瀛楀吀閿��")
     @ExcelProperty(value = "瀛楀吀閿��")
     @NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
     @Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
@@ -67,7 +58,6 @@
     /**
      * 瀛楀吀绫诲瀷
      */
-    @ApiModelProperty(value = "瀛楀吀绫诲瀷")
     @ExcelProperty(value = "瀛楀吀绫诲瀷")
     @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
     @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -76,20 +66,17 @@
     /**
      * 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�
      */
-    @ApiModelProperty(value = "鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�")
     @Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�")
     private String cssClass;
 
     /**
      * 琛ㄦ牸瀛楀吀鏍峰紡
      */
-    @ApiModelProperty(value = "琛ㄦ牸瀛楀吀鏍峰紡")
     private String listClass;
 
     /**
      * 鏄惁榛樿锛圷鏄� N鍚︼級
      */
-    @ApiModelProperty(value = "鏄惁榛樿锛圷鏄� N鍚︼級")
     @ExcelProperty(value = "鏄惁榛樿", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_yes_no")
     private String isDefault;
@@ -97,7 +84,6 @@
     /**
      * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
      */
-    @ApiModelProperty(value = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
     @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")
     private String status;
@@ -105,7 +91,6 @@
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
     public boolean getDefault() {

--
Gitblit v1.9.3