From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 172 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 111 insertions(+), 61 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 17e706d..d2c5bbf 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
@@ -8,11 +8,12 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.*;
/**
* 鑿滃崟鏉冮檺琛� sys_menu
- *
+ *
* @author ruoyi
*/
@@ -20,85 +21,134 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_menu")
-public class SysMenu
-{
- private static final long serialVersionUID = 1L;
+public class SysMenu implements Serializable {
+ private static final long serialVersionUID = 1L;
- /** 鑿滃崟ID */
- @TableId(value = "menu_id",type = IdType.AUTO)
- private Long menuId;
+ /**
+ * 鑿滃崟ID
+ */
+ @TableId(value = "menu_id", type = IdType.AUTO)
+ private Long menuId;
- /** 鑿滃崟鍚嶇О */
- @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- private String menuName;
+ /**
+ * 鑿滃崟鍚嶇О
+ */
+ @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String menuName;
- /** 鐖惰彍鍗曞悕绉� */
- private String parentName;
+ /**
+ * 鐖惰彍鍗曞悕绉�
+ */
+ @TableField(exist = false)
+ private String parentName;
- /** 鐖惰彍鍗旾D */
- private Long parentId;
+ /**
+ * 鐖惰彍鍗旾D
+ */
+ private Long parentId;
- /** 鏄剧ず椤哄簭 */
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private String orderNum;
- /** 璺敱鍦板潃 */
- @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
- private String path;
+ /**
+ * 璺敱鍦板潃
+ */
+ @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
+ private String path;
- /** 缁勪欢璺緞 */
- @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
- private String component;
+ /**
+ * 缁勪欢璺緞
+ */
+ @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
+ private String component;
- /** 鏄惁涓哄閾撅紙0鏄� 1鍚︼級 */
- private String isFrame;
+ /**
+ * 璺敱鍙傛暟
+ */
+ private String query;
- /** 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級 */
- private String isCache;
+ /**
+ * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
+ */
+ private String isFrame;
- /** 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛� */
- @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
- private String menuType;
+ /**
+ * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
+ */
+ private String isCache;
- /** 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛� */
- private String visible;
-
- /** 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛� */
- private String status;
+ /**
+ * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
+ */
+ @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
+ private String menuType;
- /** 鏉冮檺瀛楃涓� */
- @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String perms;
+ /**
+ * 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+ */
+ private String visible;
- /** 鑿滃崟鍥炬爣 */
- private String icon;
+ /**
+ * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+ */
+ private String status;
- /** 鍒涘缓鑰� */
- private String createBy;
+ /**
+ * 鏉冮檺瀛楃涓�
+ */
+ @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String perms;
- /** 鍒涘缓鏃堕棿 */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ /**
+ * 鑿滃崟鍥炬爣
+ */
+ private String icon;
- /** 鏇存柊鑰� */
- private String updateBy;
+ /**
+ * 鍒涘缓鑰�
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- /** 鏇存柊鏃堕棿 */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
- /** 澶囨敞 */
- private String remark;
+ /**
+ * 鏇存柊鑰�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
- /** 璇锋眰鍙傛暟 */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
- /** 瀛愯彍鍗� */
- @TableField(exist = false)
- private List<SysMenu> children = new ArrayList<SysMenu>();
+ /**
+ * 澶囨敞
+ */
+ 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