Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-10-11 c764c7cf8eb8080180fbb61b7cd78f86adc2a119

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java

@@ -189,7 +189,7 @@
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "动态获取菜单数据", notes = "动态获取菜单数据")
   public R dynamicMenu(String roleId,String flag){
      if (flag.equals("web") || flag.equals("newWeb") ){
      if (flag.equals("web")){
         List<WebMenuVO> list = menuService.getWebMenu(roleId);
         List<MenuVO> buttonList = menuService.getButtonList(roleId);
         WebPermissionVO webPermissionVO = new WebPermissionVO();