From 7e25a80c5bcb45ed9524a57e24bcabd0a0db625d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 24 四月 2022 11:46:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 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