From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: 星期六, 02 四月 2022 13:02:56 +0800 Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 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 860f2f2..2dc3bdc 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 @@ -8,10 +8,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; /** @@ -22,10 +22,9 @@ @Data @EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) @TableName("sys_dept") @ApiModel("閮ㄩ棬涓氬姟瀵硅薄") -public class SysDept extends TreeEntity { +public class SysDept extends TreeEntity<SysDept> { private static final long serialVersionUID = 1L; /** @@ -47,8 +46,8 @@ * 鏄剧ず椤哄簭 */ @ApiModelProperty(value = "鏄剧ず椤哄簭") - @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - private String orderNum; + @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") + private Integer orderNum; /** * 璐熻矗浜� -- Gitblit v1.9.3