From d40667a798f044b979efe6610ffd1cf68471de9c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 08 六月 2022 21:45:44 +0800 Subject: [PATCH] !182 优化新增用户与角色信息、用户与岗位信息逻辑 Merge pull request !182 from zendwang/dev --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 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 b0b8a11..d0c968e 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 @@ -12,9 +12,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; /** @@ -25,7 +25,6 @@ @Data @EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) @TableName("sys_post") @ExcelIgnoreUnannotated @ApiModel("宀椾綅淇℃伅涓氬姟瀵硅薄") @@ -62,15 +61,15 @@ */ @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") + @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_common_status") private String status; /** -- Gitblit v1.9.3