Merge branch 'feature/maolipeng/youhua' into dev

# Conflicts:
#	src/modules/root/Menu.tsx

src/modules/root/Menu.tsx

@@ -260,7 +260,7 @@ function Aside(props: any) {
                         key={item.groupCode} 
                         style={{ marginTop: 0 }} 
                         icon={<img src={item.img} className="icon-img"></img>}
-                        title={<span>{item.groupName}</span>} 
+                        title={menuType ? <span>{item.groupName}</span> : ""} 
                         onTitleClick={() => onOpenChange(item.groupCode)}
                         onTitleMouseEnter={()=> onOpenChangeForHover(item.groupCode)}
                         >