Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

云

4 小时以前 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967

 package.json

@@ -44,10 +44,13 @@
    "@vben/types": "workspace:*",
    "@vben/utils": "workspace:*",
    "@videojs-player/vue": "catalog:",
    "@vue-office/docx": "^1.6.3",
    "@vue-office/excel": "^1.7.14",
    "@vue-office/pdf": "^2.0.10",
    "@vue-office/pptx": "^1.0.1",
    "@vueuse/core": "catalog:",
    "@vueuse/integrations": "catalog:",
    "ant-design-vue": "catalog:",
    "benz-amr-recorder": "catalog:",
    "bpmn-js": "catalog:",
    "bpmn-js-properties-panel": "catalog:",
    "bpmn-js-token-simulation": "catalog:",
@@ -58,7 +61,7 @@
    "diagram-js": "catalog:",
    "fast-xml-parser": "catalog:",
    "highlight.js": "catalog:",
    "livekit-client": "catalog:",
    "livekit-client": "^2.20.0",
    "pinia": "catalog:",
    "steady-xml": "catalog:",
    "tinymce": "catalog:",
@@ -81,5 +84,6 @@
    "tsx": "^4.22.4",
    "typescript": "catalog:",
    "vite": "catalog:"
  }
}
  },
  "packageManager": "pnpm@11.0.9+sha512.34ce82e6780233cf9cad8685029a8f81d2e06196c5a9bad98879f7424940c6817c4e4524fb7d38b8553ceed48b9758b8ebaf1abd3600c232c4c8cf7366086f38"
}