From ce3f80144accbe226d0170a605f01b559ef39c32 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 三月 2022 10:43:05 +0800
Subject: [PATCH] update 优化 DataBaseHelper 工具

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java |   15 +++++++--------
 1 files changed, 7 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 3febc94..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,16 +1,16 @@
 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;
 import javax.validation.constraints.Size;
 
 /**
@@ -21,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
@@ -45,8 +44,8 @@
      * 鏄剧ず椤哄簭
      */
     @ApiModelProperty(value = "鏄剧ず椤哄簭")
-    @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
-    private String orderNum;
+    @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+    private Integer orderNum;
 
     /**
      * 璺敱鍦板潃
@@ -66,8 +65,7 @@
      * 璺敱鍙傛暟
      */
     @ApiModelProperty(value = "璺敱鍙傛暟")
-    @TableField("`query`")
-    private String query;
+    private String queryParam;
 
     /**
      * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
@@ -104,6 +102,7 @@
      * 鏉冮檺瀛楃涓�
      */
     @ApiModelProperty(value = "鏉冮檺瀛楃涓�")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
     private String perms;
 

--
Gitblit v1.9.3