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

疯狂的狮子li

2021-08-02 cfdeada3fdb415ea451fb3fb76b96a2e7977752c

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -294,7 +294,8 @@
     */
    public static String getParentMenuId(Map<String, Object> paramsObj)
    {
        if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
        if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
            && StrUtil.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
        {
            return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
        }