From 884eab4f434aecba12e6b5227457c645e9558571 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 21 十一月 2024 18:18:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
index 66328b6..35aa1ce 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,7 +28,7 @@
/**
* 瀛愬瓩鑺傜偣
*/
- private List<MenuVO> children;
+ private List<MenuVO> children = new ArrayList<>();
/**
* 鏄惁鏈夊瓙瀛欒妭鐐�
@@ -80,7 +81,7 @@
private Integer sort;
/**
- * 鑿滃崟绫诲瀷
+ * 鑿滃崟绫诲瀷: 0锛氳彍鍗曪紝1锛氭寜閽�
*/
private Integer category;
@@ -125,6 +126,11 @@
private String modeType;
/**
+ * 鍔熻兘绫诲瀷锛�0锛氬姛鑳借彍鍗曡妭鐐癸紝1锛氬垎绫�,3锛氭寜閽�
+ */
+ private int functionType;
+
+ /**
* 鏄ā鍧椾笅瀛愬璞℃槸妯″潡杩樻槸鎿嶄綔锛�0琛ㄧず鏃犲瓙鑺傜偣锛�1琛ㄧず鏄ā鍧楋紝2琛ㄧず鏄搷浣�
*/
private Integer childType;
@@ -143,6 +149,10 @@
* 妯″潡涓嬪叧鑱旂殑鎿嶄綔绫诲瀷id
*/
private String operId;
+ /**
+ * 鏄惁鏈夋潈闄愶紝0娌℃湁锛�1鏈�
+ */
+ private Integer havePermission;
/**
* 鍓嶇鏄惁闅愯棌
@@ -161,6 +171,30 @@
return funcId;
}
+ public void setFunctionType(int functionType) {
+ this.functionType = functionType;
+ }
+
+ public void setValid(Boolean valid) {
+ isValid = valid;
+ }
+
+ public void setHavePermission(Integer havePermission) {
+ this.havePermission = havePermission;
+ }
+
+ public int getFunctionType() {
+ return functionType;
+ }
+
+ public Boolean getValid() {
+ return isValid;
+ }
+
+ public Integer getHavePermission() {
+ return havePermission;
+ }
+
public String getOperId() {
return operId;
}
@@ -177,10 +211,6 @@
this.resourceMobile = resourceMobile;
}
- public void setValid(Boolean valid) {
- isValid = valid;
- }
-
public String getPathC() {
return pathC;
}
@@ -191,10 +221,6 @@
public String getResourceMobile() {
return resourceMobile;
- }
-
- public Boolean getValid() {
- return isValid;
}
public void setIsValid(Boolean isValid) {
--
Gitblit v1.9.3