From 3240968279b2960b05071db0ac4e950955a69dfd Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 21 十月 2025 13:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/system/domain/SysMenu.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java b/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
index 24990c0..d6e8b3a 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,7 +31,7 @@
private Long parentId;
/** 鏄剧ず椤哄簭 */
- private String orderNum;
+ private Integer orderNum;
/** 璺敱鍦板潃 */
private String path;
@@ -38,16 +39,25 @@
/** 缁勪欢璺緞 */
private String component;
+ /** 璺敱鍙傛暟 */
+ private String query;
+
+ /** 璺敱鍚嶇О锛岄粯璁ゅ拰璺敱鍦板潃鐩稿悓鐨勯┘宄版牸寮忥紙娉ㄦ剰锛氬洜涓簐ue3鐗堟湰鐨剅outer浼氬垹闄ゅ悕绉扮浉鍚岃矾鐢憋紝涓洪伩鍏嶅悕瀛楃殑鍐茬獊锛岀壒娈婃儏鍐靛彲浠ヨ嚜瀹氫箟锛� */
+ private String routeName;
+
/** 鏄惁涓哄閾撅紙0鏄� 1鍚︼級 */
private String isFrame;
+
+ /** 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級 */
+ private String isCache;
/** 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛� */
private String menuType;
/** 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛� */
private String visible;
-
- /** 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛� */
+
+ /** 鑿滃崟鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
private String status;
/** 鏉冮檺瀛楃涓� */
@@ -101,13 +111,13 @@
this.parentId = parentId;
}
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getOrderNum()
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ public Integer getOrderNum()
{
return orderNum;
}
- public void setOrderNum(String orderNum)
+ public void setOrderNum(Integer orderNum)
{
this.orderNum = orderNum;
}
@@ -134,6 +144,26 @@
this.component = component;
}
+ public String getQuery()
+ {
+ return query;
+ }
+
+ public void setQuery(String query)
+ {
+ this.query = query;
+ }
+
+ public String getRouteName()
+ {
+ return routeName;
+ }
+
+ public void setRouteName(String routeName)
+ {
+ this.routeName = routeName;
+ }
+
public String getIsFrame()
{
return isFrame;
@@ -142,6 +172,16 @@
public void setIsFrame(String isFrame)
{
this.isFrame = isFrame;
+ }
+
+ public String getIsCache()
+ {
+ return isCache;
+ }
+
+ public void setIsCache(String isCache)
+ {
+ this.isCache = isCache;
}
@NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
@@ -205,7 +245,7 @@
{
this.children = children;
}
-
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -215,7 +255,10 @@
.append("orderNum", getOrderNum())
.append("path", getPath())
.append("component", getComponent())
+ .append("query", getQuery())
+ .append("routeName", getRouteName())
.append("isFrame", getIsFrame())
+ .append("IsCache", getIsCache())
.append("menuType", getMenuType())
.append("visible", getVisible())
.append("status ", getStatus())
--
Gitblit v1.9.3