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 | 8 +++-----
1 files changed, 3 insertions(+), 5 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 d0a8dd8..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,6 +1,5 @@
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;
@@ -24,7 +23,7 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_menu")
@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
-public class SysMenu extends TreeEntity {
+public class SysMenu extends TreeEntity<SysMenu> {
/**
* 鑿滃崟ID
@@ -46,7 +45,7 @@
*/
@ApiModelProperty(value = "鏄剧ず椤哄簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private Long orderNum;
+ private Integer orderNum;
/**
* 璺敱鍦板潃
@@ -66,8 +65,7 @@
* 璺敱鍙傛暟
*/
@ApiModelProperty(value = "璺敱鍙傛暟")
- @TableField("`query`")
- private String query;
+ private String queryParam;
/**
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
--
Gitblit v1.9.3