From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/system/entity/Menu.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/entity/Menu.java b/src/main/java/org/springblade/modules/system/entity/Menu.java
index 3b5259d..1ae9b5c 100644
--- a/src/main/java/org/springblade/modules/system/entity/Menu.java
+++ b/src/main/java/org/springblade/modules/system/entity/Menu.java
@@ -95,6 +95,11 @@
 	@TableField("action")
 	private Integer action;
 
+	/** 操作按钮类型 */
+	@ApiModelProperty(value = "菜单类型:0:web 1:app", example = "")
+	@TableField("menu_type")
+	private Integer menuType;
+
 	/** 是否打开新页面 */
 	@ApiModelProperty(value = "是否打开新页面", example = "")
 	@TableField("is_open")
@@ -130,6 +135,11 @@
 	@TableField("background")
 	private String background;
 
+	/** 标签对象 */
+	@ApiModelProperty(value = "标签对象", example = "")
+	@TableField("label_str")
+	private String labelStr;
+
 
 	@Override
 	public boolean equals(Object obj) {

--
Gitblit v1.9.3