Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-07-23 e19e2fd9cc472f9a2c115fe8e794c3f0df468eac

 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -74,6 +74,12 @@
    /** 树名称字段 */
    private String treeName;

    /** 上级菜单ID字段 */
    private String parentMenuId;

    /** 上级菜单名称字段 */
    private String parentMenuName;

    public Long getTableId()
    {
        return tableId;
@@ -234,6 +240,26 @@
        this.treeName = treeName;
    }

    public String getParentMenuId()
    {
        return parentMenuId;
    }

    public void setParentMenuId(String parentMenuId)
    {
        this.parentMenuId = parentMenuId;
    }

    public String getParentMenuName()
    {
        return parentMenuName;
    }

    public void setParentMenuName(String parentMenuName)
    {
        this.parentMenuName = parentMenuName;
    }

    public boolean isTree()
    {
        return isTree(this.tplCategory);
@@ -268,4 +294,4 @@
        }
        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
    }
}
}