Merge remote-tracking branch 'origin/master'

lin

2024-03-11 c5a0d277347f9ecaaf934b648b6edf5b9119516b

 src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -126,7 +126,7 @@
         roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
         // 1:居民，居民需要通过人的标签来显示取保候审
         if (CommonConstant.RESIDENT.equals(roleName)) {
            extracted(labelType, roleMenus);
            // extracted(labelType, roleMenus);
         }
      }
      // 顶部菜单请求返回对应角色权限菜单