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/BaseEntity.java | 78 ++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 41 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 18a8d66..d1ad296 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -2,10 +2,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; @@ -19,52 +17,50 @@ */ @Data -@Accessors(chain = true) public class BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 鎼滅储鍊� - */ - @ApiModelProperty(value = "鎼滅储鍊�") - @TableField(exist = false) - private String searchValue; + /** + * 鎼滅储鍊� + */ + @ApiModelProperty(value = "鎼滅储鍊�") + @TableField(exist = false) + private String searchValue; - /** - * 鍒涘缓鑰� - */ - @ApiModelProperty(value = "鍒涘缓鑰�") - @TableField(fill = FieldFill.INSERT) - private String createBy; + /** + * 鍒涘缓鑰� + */ + @ApiModelProperty(value = "鍒涘缓鑰�") + @TableField(fill = FieldFill.INSERT) + private String createBy; - /** - * 鍒涘缓鏃堕棿 - */ - @ApiModelProperty(value = "鍒涘缓鏃堕棿") - @TableField(fill = FieldFill.INSERT) - private Date createTime; + /** + * 鍒涘缓鏃堕棿 + */ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + @TableField(fill = FieldFill.INSERT) + private Date createTime; - /** - * 鏇存柊鑰� - */ - @ApiModelProperty(value = "鏇存柊鑰�") - @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateBy; + /** + * 鏇存柊鑰� + */ + @ApiModelProperty(value = "鏇存柊鑰�") + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - /** - * 鏇存柊鏃堕棿 - */ - @ApiModelProperty(value = "鏇存柊鏃堕棿") - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; + /** + * 鏇存柊鏃堕棿 + */ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; - /** - * 璇锋眰鍙傛暟 - */ - @JsonIgnore - @ApiModelProperty(value = "璇锋眰鍙傛暟") - @TableField(exist = false) - private Map<String, Object> params = new HashMap<>(); + /** + * 璇锋眰鍙傛暟 + */ + @ApiModelProperty(value = "璇锋眰鍙傛暟") + @TableField(exist = false) + private Map<String, Object> params = new HashMap<>(); } -- Gitblit v1.9.3