Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

2 天以前 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe

 src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java

@@ -93,7 +93,7 @@
    private String treeName;



    /** 上级菜单ID字段 */

    private String parentMenuId;

    private Long parentMenuId;



    /** 上级菜单名称字段 */

    private String parentMenuName;

@@ -318,12 +318,12 @@
        this.treeName = treeName;

    }



    public String getParentMenuId()

    public Long getParentMenuId()

    {

        return parentMenuId;

    }



    public void setParentMenuId(String parentMenuId)

    public void setParentMenuId(Long parentMenuId)

    {

        this.parentMenuId = parentMenuId;

    }