From 7e25a80c5bcb45ed9524a57e24bcabd0a0db625d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 24 四月 2022 11:46:25 +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 | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 e8210db..cf337fb 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,14 +1,13 @@
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.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;
@@ -22,10 +21,9 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_menu")
@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
-public class SysMenu extends TreeEntity {
+public class SysMenu extends TreeEntity<SysMenu> {
/**
* 鑿滃崟ID
@@ -46,8 +44,8 @@
* 鏄剧ず椤哄簭
*/
@ApiModelProperty(value = "鏄剧ず椤哄簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer orderNum;
/**
* 璺敱鍦板潃
@@ -67,8 +65,7 @@
* 璺敱鍙傛暟
*/
@ApiModelProperty(value = "璺敱鍙傛暟")
- @TableField("`query`")
- private String query;
+ private String queryParam;
/**
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
@@ -105,6 +102,7 @@
* 鏉冮檺瀛楃涓�
*/
@ApiModelProperty(value = "鏉冮檺瀛楃涓�")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
@Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
private String perms;
--
Gitblit v1.9.3