From 68a42ee3b831e9f973c817a9792a79e5f0e4d9f3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 03 三月 2025 09:10:10 +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/entity/SysMenu.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 39a2cc0..ac1b3fc 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,10 @@
     /** 鏄惁鍙互閫夋嫨浠呯湅鎴�, 0:鍚�, 1:鏄� */
     private Integer isRersonalButton;
 
+
+    /** 浠呯湅鎴�, 0:鍚�, 1:鏄� */
+    private Integer isRersonal;
+
     /** 瀛愯彍鍗� */
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
@@ -239,7 +243,7 @@
         this.icon = icon;
     }
 
-    public Integer geIsRersonalButton()
+    public Integer getIsRersonalButton()
     {
         return isRersonalButton;
     }
@@ -247,6 +251,16 @@
     public void setIsRersonalButton(Integer isRersonalButton)
     {
         this.isRersonalButton = isRersonalButton;
+    }
+
+    public Integer getIsRersonal()
+    {
+        return isRersonal;
+    }
+
+    public void setIsRersonal(Integer isRersonal)
+    {
+        this.isRersonal = isRersonal;
     }
 
     public List<SysMenu> getChildren()
@@ -282,7 +296,7 @@
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
-            .append("isRersonalButton", geIsRersonalButton())
+            .append("isRersonalButton", getIsRersonalButton())
             .toString();
     }
 }

--
Gitblit v1.9.3