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

疯狂的狮子li

2021-02-03 6f0dfa850af12c3fdef6e830d2e3b5dfb7b66678

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


 Conflicts:

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

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

@@ -513,7 +513,12 @@
        this.open = true;
        this.$nextTick(() => {
          roleMenu.then(res => {
            this.$refs.menu.setCheckedKeys(res.checkedKeys);
            let checkedKeys = res.checkedKeys
            checkedKeys.forEach((v) => {
                this.$nextTick(()=>{
                    this.$refs.menu.setChecked(v, true ,false);
                })
            })
          });
        });
        this.title = "修改角色";
@@ -596,4 +601,4 @@
    }
  }
};
</script>
</script>