Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts: ruoyi-admin/src/main/resources/application.yml ruoyi-ui/src/store/modules/permission.js
This commit is contained in:
commit
78ef398257
|
@ -74,7 +74,6 @@ function filterChildren(childrenMap) {
|
||||||
}
|
}
|
||||||
children.push(c)
|
children.push(c)
|
||||||
})
|
})
|
||||||
childrenMap.splice(index, 1)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue