From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:22:30 +0800 Subject: [PATCH] update 适配 新序列化注解 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 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 46e9936..9f565d8 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,15 +4,14 @@ 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 jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import java.io.Serial; /** * 閮ㄩ棬琛� sys_dept @@ -23,21 +22,20 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_dept") -@ApiModel("閮ㄩ棬涓氬姟瀵硅薄") -public class SysDept extends TreeEntity { +public class SysDept extends TreeEntity<SysDept> { + + @Serial private static final long serialVersionUID = 1L; /** * 閮ㄩ棬ID */ - @ApiModelProperty(value = "閮ㄩ棬id") @TableId(value = "dept_id") private Long deptId; /** * 閮ㄩ棬鍚嶇О */ - @ApiModelProperty(value = "閮ㄩ棬鍚嶇О") @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�") private String deptName; @@ -45,27 +43,23 @@ /** * 鏄剧ず椤哄簭 */ - @ApiModelProperty(value = "鏄剧ず椤哄簭") @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - private Long orderNum; + private Integer orderNum; /** * 璐熻矗浜� */ - @ApiModelProperty(value = "璐熻矗浜�") private String leader; /** * 鑱旂郴鐢佃瘽 */ - @ApiModelProperty(value = "鑱旂郴鐢佃瘽") @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�") private String phone; /** * 閭 */ - @ApiModelProperty(value = "閭") @Email(message = "閭鏍煎紡涓嶆纭�") @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�") private String email; @@ -73,20 +67,17 @@ /** * 閮ㄩ棬鐘舵��:0姝e父,1鍋滅敤 */ - @ApiModelProperty(value = "閮ㄩ棬鐘舵��:0姝e父,1鍋滅敤") private String status; /** * 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */ - @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�") @TableLogic private String delFlag; /** * 绁栫骇鍒楄〃 */ - @ApiModelProperty(value = "绁栫骇鍒楄〃") private String ancestors; } -- Gitblit v1.9.3