Merge branch 'dev_zj' into dev

zss

2025-02-28 7d2330819e11cc505d3721373af34263f5c2fc16

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -69,6 +69,10 @@
    /** 是否可以选择仅看我, 0:否, 1:是 */
    private Integer isRersonalButton;


    /** 仅看我, 0:否, 1:是 */
    private Integer isRersonal;

    /** 子菜单 */
    private List<SysMenu> children = new ArrayList<SysMenu>();

@@ -239,7 +243,7 @@
        this.icon = icon;
    }

    public Integer geIsRersonalButton()
    public Integer getIsRersonalButton()
    {
        return isRersonalButton;
    }
@@ -247,6 +251,16 @@
    public void setIsRersonalButton(Integer isRersonalButton)
    {
        this.isRersonalButton = isRersonalButton;
    }

    public Integer getIsRersonal()
    {
        return isRersonal;
    }

    public void setIsRersonal(Integer isRersonal)
    {
        this.isRersonal = isRersonal;
    }

    public List<SysMenu> getChildren()
@@ -282,7 +296,7 @@
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .append("isRersonalButton", geIsRersonalButton())
            .append("isRersonalButton", getIsRersonalButton())
            .toString();
    }
}