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

疯狂的狮子li

2021-04-22 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1

 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 */