Commit 9df5b48e authored by wqc's avatar wqc

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

# Conflicts:
#	vue.config.js
parent 6e4d9d6a
......@@ -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
})
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment