From db523e0fdf7801cdc01f10886f2c9aec04e711bb Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 25 二月 2021 11:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/entity/BaseRole.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/BaseRole.java b/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
index 42dd898..d535732 100644
--- a/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
+++ b/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
@@ -1,9 +1,11 @@
package com.nanometer.smartlab.entity;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import org.apache.commons.lang.StringUtils;
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.Arrays;
import java.util.List;
/**
@@ -17,6 +19,9 @@
private ValidFlag validFlag;
private Timestamp createTime;
private Timestamp updateTime;
+ private String btnPermission;
+ private String userPermission;
+ private List<String> btnPermissions;
private List<String> pageIdList;
@@ -75,4 +80,33 @@
public void setPageIdList(List<String> pageIdList) {
this.pageIdList = pageIdList;
}
+
+ public String getBtnPermission() {
+ return btnPermission;
+ }
+
+ public void setBtnPermission(String btnPermission) {
+ if (StringUtils.isNotBlank(btnPermission)) {
+ btnPermissions = Arrays.asList(btnPermission.split(","));
+ }
+ this.btnPermission = btnPermission;
+ }
+
+ public String getUserPermission() {
+ return userPermission;
+ }
+
+ public void setUserPermission(String userPermission) {
+ this.userPermission = userPermission;
+ }
+
+ public List<String> getBtnPermissions() {
+ return btnPermissions;
+ }
+
+ public void setBtnPermissions(List<String> btnPermissions) {
+ this.btnPermissions = btnPermissions;
+ }
+
+
}
--
Gitblit v1.9.2