Merge branch 'next' into develop

# Conflicts:
#	packages/plugins/@nocobase/plugin-departments/package.json
#	packages/plugins/@nocobase/plugin-field-attachment-url/package.json
#	packages/plugins/@nocobase/plugin-workflow-response-message/package.json
#	packages/presets/nocobase/package.json
This commit is contained in:
chenos 2025-04-14 19:35:12 +08:00
commit 1a14a12aaf

View File

@ -32,6 +32,7 @@
"@nocobase/plugin-data-source-main": "1.7.0-alpha.10",
"@nocobase/plugin-data-source-manager": "1.7.0-alpha.10",
"@nocobase/plugin-data-visualization": "1.7.0-alpha.10",
"@nocobase/plugin-departments": "1.7.0-alpha.10",
"@nocobase/plugin-environment-variables": "1.7.0-alpha.10",
"@nocobase/plugin-error-handler": "1.7.0-alpha.10",
"@nocobase/plugin-field-attachment-url": "1.7.0-alpha.10",
@ -78,7 +79,6 @@
"@nocobase/plugin-workflow-request": "1.7.0-alpha.10",
"@nocobase/plugin-workflow-response-message": "1.7.0-alpha.10",
"@nocobase/plugin-workflow-sql": "1.7.0-alpha.10",
"@nocobase/plugin-departments": "1.7.0-alpha.10",
"@nocobase/server": "1.7.0-alpha.10",
"cronstrue": "^2.11.0",
"fs-extra": "^11.1.1"