From 25df5530b89fc57a3f32a0e4c706bb40d3e4b415 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 Nov 2023 17:27:58 +0800
Subject: [PATCH] 标签控制+通知详情优化

---
 src/main/java/org/springblade/modules/system/entity/Menu.java |  104 +++++++++++++++++++++++++++------------------------
 1 files changed, 55 insertions(+), 49 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 549c7df..3b5259d 100644
--- a/src/main/java/org/springblade/modules/system/entity/Menu.java
+++ b/src/main/java/org/springblade/modules/system/entity/Menu.java
@@ -16,10 +16,7 @@
  */
 package org.springblade.modules.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.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -57,73 +54,82 @@
 	@ApiModelProperty(value = "菜单父主键")
 	private Long parentId;
 
-	/**
-	 * 菜单编号
-	 */
-	@ApiModelProperty(value = "菜单编号")
+
+	/** 菜单编号 */
+	@ApiModelProperty(value = "菜单编号", example = "")
+	@TableField("code")
 	private String code;
 
-	/**
-	 * 菜单名称
-	 */
-	@ApiModelProperty(value = "菜单名称")
+	/** 菜单名称 */
+	@ApiModelProperty(value = "菜单名称", example = "")
+	@TableField("name")
 	private String name;
 
-	/**
-	 * 菜单别名
-	 */
-	@ApiModelProperty(value = "菜单别名")
+	/** 菜单别名 */
+	@ApiModelProperty(value = "菜单别名", example = "")
+	@TableField("alias")
 	private String alias;
 
-	/**
-	 * 请求地址
-	 */
-	@ApiModelProperty(value = "请求地址")
+	/** 请求地址 */
+	@ApiModelProperty(value = "请求地址", example = "")
+	@TableField("path")
 	private String path;
 
-	/**
-	 * 菜单资源
-	 */
-	@ApiModelProperty(value = "菜单资源")
+	/** 菜单资源 */
+	@ApiModelProperty(value = "菜单资源", example = "")
+	@TableField("source")
 	private String source;
 
-	/**
-	 * 排序
-	 */
-	@ApiModelProperty(value = "排序")
+	/** 排序 */
+	@ApiModelProperty(value = "排序", example = "")
+	@TableField("sort")
 	private Integer sort;
 
-	/**
-	 * 菜单类型
-	 */
-	@ApiModelProperty(value = "菜单类型")
+	/** 菜单类型：菜单，按钮 */
+	@ApiModelProperty(value = "菜单类型：菜单，按钮", example = "")
+	@TableField("category")
 	private Integer category;
 
-	/**
-	 * 操作按钮类型
-	 */
-	@ApiModelProperty(value = "操作按钮类型")
+	/** 操作按钮类型 */
+	@ApiModelProperty(value = "操作按钮类型", example = "")
+	@TableField("action")
 	private Integer action;
 
-	/**
-	 * 是否打开新页面
-	 */
-	@ApiModelProperty(value = "是否打开新页面")
+	/** 是否打开新页面 */
+	@ApiModelProperty(value = "是否打开新页面", example = "")
+	@TableField("is_open")
 	private Integer isOpen;
 
-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
+	/** 组件地址 */
+	@ApiModelProperty(value = "组件地址", example = "")
+	@TableField("component")
+	private String component;
+
+	/** 备注 */
+	@ApiModelProperty(value = "备注", example = "")
+	@TableField("remark")
 	private String remark;
 
-	/**
-	 * 是否已删除
-	 */
-	@TableLogic
-	@ApiModelProperty(value = "是否已删除")
+	/** 是否已删除 */
+	@ApiModelProperty(value = "是否已删除", example = "")
+	@TableField("is_deleted")
 	private Integer isDeleted;
 
+	/** 图片地址 */
+	@ApiModelProperty(value = "图片地址", example = "")
+	@TableField("picture_img")
+	private String pictureImg;
+
+	/** 标签 */
+	@ApiModelProperty(value = "标签", example = "")
+	@TableField("label_id")
+	private String labelId;
+
+	/** 颜色 */
+	@ApiModelProperty(value = "颜色", example = "")
+	@TableField("background")
+	private String background;
+
 
 	@Override
 	public boolean equals(Object obj) {

--
Gitblit v1.9.3