Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 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,Integer menuType,String roleName);
   List<MenuVO> routes(String roleId, Long topMenuId,Integer labelType,Integer menuType,String roleName,String houseCode);

   /**
    * 菜单树形结构