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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 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();