分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

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

@@ -69,6 +69,32 @@
    /** 子菜单 */
    private List<SysMenu> children = new ArrayList<SysMenu>();

    /** 是否可以选择仅看我, 0:否, 1:是 */
    private Integer isRersonalButton;

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

    public Integer getIsRersonalButton()
    {
        return isRersonalButton;
    }

    public void setIsRersonalButton(Integer isRersonalButton)
    {
        this.isRersonalButton = isRersonalButton;
    }

    public Integer getIsRersonal()
    {
        return isRersonal;
    }

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

    public Long getMenuId()
    {
        return menuId;
@@ -269,6 +295,7 @@
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .append("isRersonalButton", getIsRersonalButton())
            .toString();
    }
}