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-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 80bf275..e140277 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -8,13 +8,12 @@ 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 lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * 宀椾綅琛� sys_post @@ -26,13 +25,11 @@ @EqualsAndHashCode(callSuper = true) @TableName("sys_post") @ExcelIgnoreUnannotated -@ApiModel("宀椾綅淇℃伅涓氬姟瀵硅薄") public class SysPost extends BaseEntity { /** * 宀椾綅搴忓彿 */ - @ApiModelProperty(value = "宀椾綅搴忓彿") @ExcelProperty(value = "宀椾綅搴忓彿") @TableId(value = "post_id") private Long postId; @@ -40,7 +37,6 @@ /** * 宀椾綅缂栫爜 */ - @ApiModelProperty(value = "宀椾綅缂栫爜") @ExcelProperty(value = "宀椾綅缂栫爜") @NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖") @Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�") @@ -49,7 +45,6 @@ /** * 宀椾綅鍚嶇О */ - @ApiModelProperty(value = "宀椾綅鍚嶇О") @ExcelProperty(value = "宀椾綅鍚嶇О") @NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�") @@ -58,29 +53,25 @@ /** * 宀椾綅鎺掑簭 */ - @ApiModelProperty(value = "宀椾綅鎺掑簭") @ExcelProperty(value = "宀椾綅鎺掑簭") - @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - private String postSort; + @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") + private Integer postSort; /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ - @ApiModelProperty(value = "鐘舵�侊紙0姝e父 1鍋滅敤锛�") @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys_normal_disable") private String status; /** * 澶囨敞 */ - @ApiModelProperty(value = "澶囨敞") private String remark; /** * 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦� */ - @ApiModelProperty(value = "鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�") @TableField(exist = false) private boolean flag = false; -- Gitblit v1.9.3