Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
This commit is contained in:
YunaiV
2022-10-23 22:16:54 +08:00
182 changed files with 3857 additions and 1028 deletions

View File

@ -67,7 +67,7 @@ export default {
},
// 设置子路由
childrenMenus() {
var childrenMenus = [];
const childrenMenus = [];
this.routers.map((router) => {
for (var item in router.children) {
if (router.children[item].parentPath === undefined) {