From 41242cd4aa6c59ae96a1937510c1dd6edc850983 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update java 1.8 => 17 update springboot 2.7.7 => 3.0.1 update springboot-admin 2.7.10 => 3.0.0-M8 update springdoc 1.6.14 => 2.0.2 update lock4j 2.2.3 => 2.2.4 update dynamic-ds 3.5.2 => 3.6.1
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
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 b7caaea..5268289 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
@@ -17,6 +17,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import java.util.Set;
/**
* 瑙掕壊琛� sys_role
@@ -82,7 +83,7 @@
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
@ExcelProperty(value = "瑙掕壊鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_common_status")
+ @ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
/**
@@ -114,6 +115,12 @@
@TableField(exist = false)
private Long[] deptIds;
+ /**
+ * 瑙掕壊鑿滃崟鏉冮檺
+ */
+ @TableField(exist = false)
+ private Set<String> permissions;
+
public SysRole(Long roleId) {
this.roleId = roleId;
}
--
Gitblit v1.9.3