From ac47375aba17033ace1791bdebb5f5bb7d343827 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: Thu, 17 Mar 2022 11:45:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E3=80=81=E5=B2=97=E4=BD=8D=E3=80=81=E5=AD=97=E5=85=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=9C=A8PostgreSQL=E6=89=A7=E8=A1=8C=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E6=88=96=E8=80=85=E6=9B=B4=E6=96=B0SQL=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=9A=84=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/core/domain/entity/SysDictData.java     | 2 +-
 .../java/com/ruoyi/common/core/domain/entity/SysRole.java    | 5 +++--
 .../src/main/java/com/ruoyi/system/domain/SysPost.java       | 5 +++--
 3 files changed, 7 insertions(+), 5 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 dc7f0512f..c61c91726 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
@@ -42,7 +42,7 @@ public class SysDictData extends BaseEntity {
      */
     @ApiModelProperty(value = "字典排序")
     @ExcelProperty(value = "字典排序")
-    private Long dictSort;
+    private Integer dictSort;
 
     /**
      * 字典标签
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 3c2ff4f29..8d9166097 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -16,6 +16,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 /**
@@ -62,8 +63,8 @@ public class SysRole extends BaseEntity {
      */
     @ApiModelProperty(value = "角色排序")
     @ExcelProperty(value = "角色排序")
-    @NotBlank(message = "显示顺序不能为空")
-    private String roleSort;
+    @NotNull(message = "显示顺序不能为空")
+    private Integer roleSort;
 
     /**
      * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
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 80bf275c1..d0c968e42 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
@@ -14,6 +14,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 /**
@@ -60,8 +61,8 @@ public class SysPost extends BaseEntity {
      */
     @ApiModelProperty(value = "岗位排序")
     @ExcelProperty(value = "岗位排序")
-    @NotBlank(message = "显示顺序不能为空")
-    private String postSort;
+    @NotNull(message = "显示顺序不能为空")
+    private Integer postSort;
 
     /**
      * 状态（0正常 1停用）