Merge branch 'net5.0'

This commit is contained in:
不做码农
2022-05-09 12:28:54 +08:00
32 changed files with 854 additions and 226 deletions

View File

@@ -272,7 +272,7 @@ namespace ZR.Service
Name = GetRouteName(menu),
Path = GetRoutePath(menu),
Component = GetComponent(menu),
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache))
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
};
List<SysMenu> cMenus = menu.children;
@@ -291,7 +291,7 @@ namespace ZR.Service
Path = menu.path,
Component = menu.component,
Name = string.IsNullOrEmpty(menu.path) ? "" : menu.path.ToLower(),
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache))
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
};
childrenList.Add(children);
router.Children = childrenList;