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-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java index 387adb4..a451bb9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -1,64 +1,74 @@ package com.ruoyi.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.*; -import lombok.experimental.Accessors; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.List; /** * 璺敱閰嶇疆淇℃伅 * - * @author ruoyi + * @author Lion Li */ @Data -@NoArgsConstructor -@Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) +@ApiModel("璺敱閰嶇疆淇℃伅") public class RouterVo { + /** * 璺敱鍚嶅瓧 */ + @ApiModelProperty(value = "璺敱鍚嶅瓧") private String name; /** * 璺敱鍦板潃 */ + @ApiModelProperty(value = "璺敱鍦板潃") private String path; /** * 鏄惁闅愯棌璺敱锛屽綋璁剧疆 true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇 */ + @ApiModelProperty(value = "鏄惁闅愯棌璺敱锛屽綋璁剧疆 true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇") private boolean hidden; /** * 閲嶅畾鍚戝湴鍧�锛屽綋璁剧疆 noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮 */ + @ApiModelProperty(value = "閲嶅畾鍚戝湴鍧�锛屽綋璁剧疆 noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮") private String redirect; /** * 缁勪欢鍦板潃 */ + @ApiModelProperty(value = "缁勪欢鍦板潃") private String component; /** * 璺敱鍙傛暟锛氬 {"id": 1, "name": "ry"} */ + @ApiModelProperty(value = "璺敱鍙傛暟锛氬 {\"id\": 1, \"name\": \"ry\"}") private String query; /** * 褰撲綘涓�涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜�1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮�--濡傜粍浠堕〉闈� */ + @ApiModelProperty(value = "褰撲綘涓�涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜�1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮�--濡傜粍浠堕〉闈�") private Boolean alwaysShow; /** * 鍏朵粬鍏冪礌 */ + @ApiModelProperty(value = "鍏朵粬鍏冪礌") private MetaVo meta; /** * 瀛愯矾鐢� */ + @ApiModelProperty(value = "瀛愯矾鐢�") private List<RouterVo> children; } -- Gitblit v1.9.3