From be7766b5f0dec84d537af9811e50f46ab3dfdb2a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 10:03:56 +0800
Subject: [PATCH] update 同步ruoyi
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 146 +++++++++++++++++++++---------------------------
1 files changed, 65 insertions(+), 81 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..6e366a7 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
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.TreeEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@@ -20,101 +19,86 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_menu")
-@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
-public class SysMenu extends TreeEntity {
+public class SysMenu extends TreeEntity<SysMenu> {
- /**
- * 鑿滃崟ID
- */
- @ApiModelProperty(value = "鑿滃崟ID")
- @TableId(value = "menu_id")
- private Long menuId;
+ /**
+ * 鑿滃崟ID
+ */
+ @TableId(value = "menu_id")
+ private Long menuId;
- /**
- * 鑿滃崟鍚嶇О
- */
- @ApiModelProperty(value = "鑿滃崟鍚嶇О")
- @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- private String menuName;
+ /**
+ * 鑿滃崟鍚嶇О
+ */
+ @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String menuName;
- /**
- * 鏄剧ず椤哄簭
- */
- @ApiModelProperty(value = "鏄剧ず椤哄簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer orderNum;
- /**
- * 璺敱鍦板潃
- */
- @ApiModelProperty(value = "璺敱鍦板潃")
- @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
- private String path;
+ /**
+ * 璺敱鍦板潃
+ */
+ @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
+ private String path;
- /**
- * 缁勪欢璺緞
- */
- @ApiModelProperty(value = "缁勪欢璺緞")
- @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
- private String component;
+ /**
+ * 缁勪欢璺緞
+ */
+ @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
+ private String component;
/**
* 璺敱鍙傛暟
*/
- @ApiModelProperty(value = "璺敱鍙傛暟")
- private String query;
+ private String queryParam;
- /**
- * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
- */
- @ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
- private String isFrame;
+ /**
+ * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
+ */
+ private String isFrame;
- /**
- * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
- */
- @ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
- private String isCache;
+ /**
+ * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
+ */
+ private String isCache;
- /**
- * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
- */
- @ApiModelProperty(value = "绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�")
- @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
- private String menuType;
+ /**
+ * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
+ */
+ @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
+ private String menuType;
- /**
- * 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
- */
- @ApiModelProperty(value = "鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
- private String visible;
+ /**
+ * 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+ */
+ private String visible;
- /**
- * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
- */
- @ApiModelProperty(value = "鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
- private String status;
+ /**
+ * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+ */
+ private String status;
- /**
- * 鏉冮檺瀛楃涓�
- */
- @ApiModelProperty(value = "鏉冮檺瀛楃涓�")
- @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String perms;
+ /**
+ * 鏉冮檺瀛楃涓�
+ */
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String perms;
- /**
- * 鑿滃崟鍥炬爣
- */
- @ApiModelProperty(value = "鑿滃崟鍥炬爣")
- private String icon;
+ /**
+ * 鑿滃崟鍥炬爣
+ */
+ private String icon;
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
}
--
Gitblit v1.9.3