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

疯狂的狮子li

2020-07-17 a53a3b3119659d6ec28b458dcefd46f4ec49d55c

 ruoyi-ui/src/views/system/menu/index.vue

@@ -314,8 +314,10 @@
    handleAdd(row) {
      this.reset();
      this.getTreeselect();
      if (row != null) {
      if (row != null && row.menuId) {
        this.form.parentId = row.menuId;
      } else {
        this.form.parentId = 0;
      }
      this.open = true;
      this.title = "添加菜单";