From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期三, 15 一月 2025 14:28:25 +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 | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 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 5c73e12..0e7159d 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锛氬垎绫� + */ + private int functionType; + + /** * 鏄ā鍧椾笅瀛愬璞℃槸妯″潡杩樻槸鎿嶄綔锛�0琛ㄧず鏃犲瓙鑺傜偣锛�1琛ㄧず鏄ā鍧楋紝2琛ㄧず鏄搷浣� */ private Integer childType; @@ -165,6 +171,22 @@ return funcId; } + public void setFunctionType(int functionType) { + this.functionType = functionType; + } + + public void setHavePermission(Integer havePermission) { + this.havePermission = havePermission; + } + + public int getFunctionType() { + return functionType; + } + + public Integer getHavePermission() { + return havePermission; + } + public String getOperId() { return operId; } @@ -181,10 +203,6 @@ this.resourceMobile = resourceMobile; } - public void setValid(Boolean valid) { - isValid = valid; - } - public String getPathC() { return pathC; } @@ -197,10 +215,6 @@ return resourceMobile; } - public Boolean getValid() { - return isValid; - } - public void setIsValid(Boolean isValid) { this.isValid = isValid; } @@ -209,6 +223,8 @@ return isValid; } + + public void setChildType(Integer childType) { this.childType = childType; } -- Gitblit v1.9.3