From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
index e4785df..33818ce 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@@ -27,6 +27,9 @@
/** 鏄惁鍙互閫夋嫨浠呯湅鎴�, 0:鍚�, 1:鏄� */
private Integer isRersonalButton;
+ /** 鏄惁纭鍙湅鎴�, 0:鍚�, 1:鏄� */
+ private Integer isRersonal;
+
/** 鑺傜偣绂佺敤 */
private boolean disabled = false;
@@ -52,6 +55,7 @@
this.id = menu.getMenuId();
this.label = menu.getMenuName();
this.isRersonalButton = menu.getIsRersonalButton();
+ this.isRersonal = menu.getIsRersonal();
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
@@ -95,7 +99,7 @@
this.children = children;
}
- public Integer geIsRersonalButton()
+ public Integer getIsRersonalButton()
{
return isRersonalButton;
}
@@ -104,4 +108,14 @@
{
this.isRersonalButton = isRersonalButton;
}
+
+ public Integer getIsRersonal()
+ {
+ return isRersonal;
+ }
+
+ public void setIsRersonal(Integer isRersonalButton)
+ {
+ this.isRersonal = isRersonal;
+ }
}
--
Gitblit v1.9.3