From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 84 ++++++++++++-----------------------------
1 files changed, 25 insertions(+), 59 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index d2c5bbf..30d074b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -1,154 +1,120 @@
package com.ruoyi.common.core.domain.entity;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.TreeEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.*;
/**
* 鑿滃崟鏉冮檺琛� sys_menu
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_menu")
-public class SysMenu implements Serializable {
- private static final long serialVersionUID = 1L;
+@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
+public class SysMenu extends TreeEntity {
/**
* 鑿滃崟ID
*/
- @TableId(value = "menu_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "鑿滃崟ID")
+ @TableId(value = "menu_id")
private Long menuId;
/**
* 鑿滃崟鍚嶇О
*/
+ @ApiModelProperty(value = "鑿滃崟鍚嶇О")
@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String menuName;
/**
- * 鐖惰彍鍗曞悕绉�
- */
- @TableField(exist = false)
- private String parentName;
-
- /**
- * 鐖惰彍鍗旾D
- */
- private Long parentId;
-
- /**
* 鏄剧ず椤哄簭
*/
+ @ApiModelProperty(value = "鏄剧ず椤哄簭")
@NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private String orderNum;
/**
* 璺敱鍦板潃
*/
+ @ApiModelProperty(value = "璺敱鍦板潃")
@Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
private String path;
/**
* 缁勪欢璺緞
*/
+ @ApiModelProperty(value = "缁勪欢璺緞")
@Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
private String component;
/**
* 璺敱鍙傛暟
*/
+ @ApiModelProperty(value = "璺敱鍙傛暟")
private String query;
/**
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
*/
+ @ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
private String isFrame;
/**
* 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
*/
+ @ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
private String isCache;
/**
* 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
*/
+ @ApiModelProperty(value = "绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�")
@NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
private String menuType;
/**
* 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
*/
+ @ApiModelProperty(value = "鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
private String visible;
/**
* 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
*/
+ @ApiModelProperty(value = "鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
private String status;
/**
* 鏉冮檺瀛楃涓�
*/
+ @ApiModelProperty(value = "鏉冮檺瀛楃涓�")
@Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
private String perms;
/**
* 鑿滃崟鍥炬爣
*/
+ @ApiModelProperty(value = "鑿滃崟鍥炬爣")
private String icon;
-
- /**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
-
- /**
- * 瀛愯彍鍗�
- */
- @TableField(exist = false)
- private List<SysMenu> children = new ArrayList<SysMenu>();
}
--
Gitblit v1.9.3