From a46a7458e10828dc45eb242d1eebfb92ff83f107 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 06 七月 2022 15:46:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 dc7f051..c61c917 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 @@
      */
     @ApiModelProperty(value = "瀛楀吀鎺掑簭")
     @ExcelProperty(value = "瀛楀吀鎺掑簭")
-    private Long dictSort;
+    private Integer dictSort;
 
     /**
      * 瀛楀吀鏍囩

--
Gitblit v1.9.3