Merge remote-tracking branch 'origin/rbac1.0' into rbac1.0

# Conflicts:
#	vue.config.js

src/views/system/dept/index.vue

@@ -254,7 +254,7 @@ export default {
   },
   created() {
     this.getList()
-    this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
+    this.getDicts('sys_normal_disable').then(response => {
       this.statusOptions = response.data
     })
   },