Merge remote-tracking branch 'origin/master'

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthMenuRespVO.java

@@ -34,6 +34,12 @@ public class AuthMenuRespVO {
     @ApiModelProperty(value = "菜单图标", example = "/menu/list", notes = "仅菜单类型为菜单或者目录时，才需要传")
     private String icon;
 
+    @ApiModelProperty(value = "是否可见", required = true, example = "false")
+    private Boolean visible;
+
+    @ApiModelProperty(value = "是否缓存", required = true, example = "false")
+    private Boolean keepAlive;
+
     /**
      * 子路由
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java

@@ -50,4 +50,10 @@ public class MenuBaseVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    @ApiModelProperty(value = "是否可见", example = "false")
+    private Boolean visible;
+
+    @ApiModelProperty(value = "是否缓存", example = "false")
+    private Boolean keepAlive;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java

@@ -24,7 +24,6 @@ public class MenuSimpleRespVO {
     private Long parentId;
 
     @ApiModelProperty(value = "类型", required = true, example = "1", notes = "参见 MenuTypeEnum 枚举类")
-    @NotNull(message = "菜单类型不能为空")
     private Integer type;
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/MenuDO.java

@@ -72,5 +72,19 @@ public class MenuDO extends BaseDO {
      * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
+    /**
+     * 是否可见
+     *
+     * 只有菜单、目录使用
+     * 当设置为 true 时，该菜单不会展示在侧边栏，但是路由还是存在。例如说，一些独立的编辑页面 /edit/1024 等等
+     */
+    private Boolean visible;
+    /**
+     * 是否缓存
+     *
+     * 只有菜单、目录使用
+     * 是否使用 Vue 路由的 keep-alive 特性
+     */
+    private Boolean keepAlive;
 
 }