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

疯狂的狮子li

2021-04-14 f093da99ecb963d19d62dc0f242f00b20bc8895c

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

@@ -35,6 +35,7 @@
    private String menuName;

    /** 父菜单名称 */
    @TableField(exist = false)
    private String parentName;

    /** 父菜单ID */