From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java |   31 ++++++-------------------------
 1 files changed, 6 insertions(+), 25 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..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
@@ -1,14 +1,11 @@
 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,22 +19,18 @@
 
 @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;
 
     /**
      * 鑿滃崟鍚嶇О
      */
-    @ApiModelProperty(value = "鑿滃崟鍚嶇О")
     @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
     private String menuName;
@@ -45,79 +38,67 @@
     /**
      * 鏄剧ず椤哄簭
      */
-    @ApiModelProperty(value = "鏄剧ず椤哄簭")
-    @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
-    private String orderNum;
+    @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+    private Integer orderNum;
 
     /**
      * 璺敱鍦板潃
      */
-    @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 = "璺敱鍙傛暟")
-    @TableField("`query`")
-    private String query;
+    private String queryParam;
 
     /**
      * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
      */
-    @ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
     private String isFrame;
 
     /**
      * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
      */
-    @ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
     private String isCache;
 
     /**
      * 绫诲瀷锛圡鐩綍 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 status;
 
     /**
      * 鏉冮檺瀛楃涓�
      */
-    @ApiModelProperty(value = "鏉冮檺瀛楃涓�")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
     private String perms;
 
     /**
      * 鑿滃崟鍥炬爣
      */
-    @ApiModelProperty(value = "鑿滃崟鍥炬爣")
     private String icon;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
 }

--
Gitblit v1.9.3