From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。

---
 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