From b82f8f6f82f0d9348997abb77e5d72deac078fa2 Mon Sep 17 00:00:00 2001 From: xieb <vip_xiaobin810@163.com> Date: Sun, 23 Apr 2023 15:40:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java index 721249a..849d203 100644 --- a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java +++ b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java @@ -16,10 +16,8 @@ */ package cn.gistack.system.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; @@ -88,6 +86,43 @@ private String source; /** + * 图标路径 + */ + @ApiModelProperty(value = "图标路径") + private String iconPath; + + /** + * 选中图标路径 + */ + @ApiModelProperty(value = "选中图标路径") + private String iconPathSelected; + + /** + * 组件类型 + */ + @ApiModelProperty(value = "组件类型") + private String components; + + /** + * 组件路径 + */ + @ApiModelProperty(value = "组件路径") + @TableField(value = "COMPONENT_PATH",updateStrategy = FieldStrategy.IGNORED) + private String componentPath; + + /** + * 层级 + */ + @ApiModelProperty(value = "层级") + private Integer level; + + /** + * 组件路径 + */ + @ApiModelProperty(value = "组件路径") + private String hasSubMenu; + + /** * 排序 */ @ApiModelProperty(value = "排序") @@ -105,6 +140,8 @@ @ApiModelProperty(value = "操作按钮类型") private Integer action; + + /** * 是否打开新页面 */ -- Gitblit v1.9.3