From fe98fba5b51ae4f1ef62cbdbd9b6a8ec20e8e623 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 12 七月 2022 18:01:56 +0800
Subject: [PATCH] !527 调增数组格式声明，random随机转换修正 Merge pull request !527 from 靖少毅/jsy20220705
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 b8ad1f3..229f418 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
@@ -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,8 +39,14 @@
/** 组件路径 */
private String component;
+ /** 路由参数 */
+ private String query;
+
/** 是否为外链（0是 1否） */
private String isFrame;
+
+ /** 是否缓存（0缓存 1不缓存） */
+ private String isCache;
/** 类型（M目录 C菜单 F按钮） */
private String menuType;
@@ -101,13 +108,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 +141,16 @@
this.component = component;
}
+ public String getQuery()
+ {
+ return query;
+ }
+
+ public void setQuery(String query)
+ {
+ this.query = query;
+ }
+
public String getIsFrame()
{
return isFrame;
@@ -142,6 +159,16 @@
public void setIsFrame(String isFrame)
{
this.isFrame = isFrame;
+ }
+
+ public String getIsCache()
+ {
+ return isCache;
+ }
+
+ public void setIsCache(String isCache)
+ {
+ this.isCache = isCache;
}
@NotBlank(message = "菜单类型不能为空")
@@ -216,6 +243,7 @@
.append("path", getPath())
.append("component", getComponent())
.append("isFrame", getIsFrame())
+ .append("IsCache", getIsCache())
.append("menuType", getMenuType())
.append("visible", getVisible())
.append("status ", getStatus())
--
Gitblit v1.9.2