From 02bf210180f806ed4f001b2dd0406d7e934bcf7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 25 Aug 2022 09:56:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20=E4=B8=8E=20=E8=8F=9C=E5=8D=95=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/system/api/domain/SysRole.java | 2 +- .../src/main/java/com/ruoyi/system/domain/SysMenu.java | 2 +- .../src/main/java/com/ruoyi/system/domain/SysPost.java | 2 +- sql/ry-cloud.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java index 08ca6c18..124c5bd9 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java @@ -82,7 +82,7 @@ public class SysRole extends BaseEntity { * 角色状态（0正常 1停用） */ @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys_normal_disable") private String status; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index a935dd28..8ed2e60b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -82,7 +82,7 @@ public class SysMenu extends TreeEntity { private String visible; /** - * 菜单状态（0显示 1隐藏） + * 菜单状态（0正常 1停用） */ private String status; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index cb21cc4e..51d02dc3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -63,7 +63,7 @@ public class SysPost extends BaseEntity { * 状态（0正常 1停用） */ @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys_normal_disable") private String status; /** diff --git a/sql/ry-cloud.sql b/sql/ry-cloud.sql index 40af79d7..6df6a6d7 100644 --- a/sql/ry-cloud.sql +++ b/sql/ry-cloud.sql @@ -143,7 +143,7 @@ create table sys_menu ( is_frame int(1) default 1 comment '是否为外链（0是 1否）', is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '菜单状态（0显示 1隐藏）', + visible char(1) default 0 comment '显示状态（0显示 1隐藏）', status char(1) default 0 comment '菜单状态（0正常 1停用）', perms varchar(100) default null comment '权限标识', icon varchar(100) default '#' comment '菜单图标',