From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index ad73692..5d769fa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -69,6 +69,32 @@
/** 瀛愯彍鍗� */
private List<SysMenu> children = new ArrayList<SysMenu>();
+ /** 鏄惁鍙互閫夋嫨浠呯湅鎴�, 0:鍚�, 1:鏄� */
+ private Integer isRersonalButton;
+
+ /** 浠呯湅鎴�, 0:鍚�, 1:鏄� */
+ private Integer isRersonal;
+
+ public Integer getIsRersonalButton()
+ {
+ return isRersonalButton;
+ }
+
+ public void setIsRersonalButton(Integer isRersonalButton)
+ {
+ this.isRersonalButton = isRersonalButton;
+ }
+
+ public Integer getIsRersonal()
+ {
+ return isRersonal;
+ }
+
+ public void setIsRersonal(Integer isRersonal)
+ {
+ this.isRersonal = isRersonal;
+ }
+
public Long getMenuId()
{
return menuId;
@@ -269,6 +295,7 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
+ .append("isRersonalButton", getIsRersonalButton())
.toString();
}
}
--
Gitblit v1.9.3