From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java |  151 +++++++++++++++++++++++++------------------------
 1 files changed, 77 insertions(+), 74 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 30d074b..e8210db 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,5 +1,6 @@
 package com.ruoyi.common.core.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -10,6 +11,7 @@
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 /**
@@ -25,96 +27,97 @@
 @ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
 public class SysMenu extends TreeEntity {
 
-	/**
-	 * 鑿滃崟ID
-	 */
-	@ApiModelProperty(value = "鑿滃崟ID")
-	@TableId(value = "menu_id")
-	private Long menuId;
+    /**
+     * 鑿滃崟ID
+     */
+    @ApiModelProperty(value = "鑿滃崟ID")
+    @TableId(value = "menu_id")
+    private Long menuId;
 
-	/**
-	 * 鑿滃崟鍚嶇О
-	 */
-	@ApiModelProperty(value = "鑿滃崟鍚嶇О")
-	@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
-	@Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
-	private String menuName;
+    /**
+     * 鑿滃崟鍚嶇О
+     */
+    @ApiModelProperty(value = "鑿滃崟鍚嶇О")
+    @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
+    @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+    private String menuName;
 
-	/**
-	 * 鏄剧ず椤哄簭
-	 */
-	@ApiModelProperty(value = "鏄剧ず椤哄簭")
-	@NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
-	private String orderNum;
+    /**
+     * 鏄剧ず椤哄簭
+     */
+    @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 = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
+    private String path;
 
-	/**
-	 * 缁勪欢璺緞
-	 */
-	@ApiModelProperty(value = "缁勪欢璺緞")
-	@Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
-	private String component;
+    /**
+     * 缁勪欢璺緞
+     */
+    @ApiModelProperty(value = "缁勪欢璺緞")
+    @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
+    private String component;
 
     /**
      * 璺敱鍙傛暟
      */
-	@ApiModelProperty(value = "璺敱鍙傛暟")
+    @ApiModelProperty(value = "璺敱鍙傛暟")
+    @TableField("`query`")
     private String query;
 
-	/**
-	 * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
-	 */
-	@ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
-	private String isFrame;
+    /**
+     * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
+     */
+    @ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
+    private String isFrame;
 
-	/**
-	 * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
-	 */
-	@ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
-	private String isCache;
+    /**
+     * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
+     */
+    @ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
+    private String isCache;
 
-	/**
-	 * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
-	 */
-	@ApiModelProperty(value = "绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�")
-	@NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
-	private String menuType;
+    /**
+     * 绫诲瀷锛圡鐩綍 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 visible;
 
-	/**
-	 * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
-	 */
-	@ApiModelProperty(value = "鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
-	private String status;
+    /**
+     * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+     */
+    @ApiModelProperty(value = "鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
+    private String status;
 
-	/**
-	 * 鏉冮檺瀛楃涓�
-	 */
-	@ApiModelProperty(value = "鏉冮檺瀛楃涓�")
-	@Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
-	private String perms;
+    /**
+     * 鏉冮檺瀛楃涓�
+     */
+    @ApiModelProperty(value = "鏉冮檺瀛楃涓�")
+    @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+    private String perms;
 
-	/**
-	 * 鑿滃崟鍥炬爣
-	 */
-	@ApiModelProperty(value = "鑿滃崟鍥炬爣")
-	private String icon;
+    /**
+     * 鑿滃崟鍥炬爣
+     */
+    @ApiModelProperty(value = "鑿滃崟鍥炬爣")
+    private String icon;
 
-	/**
-	 * 澶囨敞
-	 */
-	@ApiModelProperty(value = "澶囨敞")
-	private String remark;
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
 
 }

--
Gitblit v1.9.3