Merge remote-tracking branch 'origin/master'

linwe

2023-12-21 0b7d27cb994b6f985953100812dc7ca0dc03c77d

 src/main/java/org/springblade/modules/system/service/IMenuService.java

@@ -59,7 +59,7 @@
    * @param topMenuId
    * @return
    */
   List<MenuVO> routes(String roleId, Long topMenuId,Integer labelType);
   List<MenuVO> routes(String roleId, Long topMenuId,Integer labelType,Integer menuType);

   /**
    * 菜单树形结构