Merge branch 'develop'
# Conflicts: # CLAUDE.md # backend/src/backend/api/platform/members.py # backend/src/backend/main.py # common/src/common/config.py # frontend/app/app.css # frontend/app/components/common/Topbar.tsx # frontend/app/components/ui/table.tsx # frontend/app/features/admin/PermissionCheckboxList.tsx # frontend/app/features/admin/UserFormDialog.tsx # frontend/app/features/platform/DashboardRoute.tsx # frontend/app/features/platform/PythonEditor.tsx # frontend/app/features/platform/ScriptWorkspace.tsx # frontend/app/routes.ts # frontend/app/routes/platform.navigation.tsx # frontend/app/routes/platform.tsx # frontend/app/services/api/_shared.ts # frontend/app/services/api/boundApi.ts # frontend/app/services/api/fileLocks.ts # frontend/app/services/api/platformEmployees.ts # frontend/app/services/api/resources.ts # frontend/app/services/api/schedules.ts # frontend/app/services/api/scripts.ts # frontend/app/services/api/workspaceMembers.ts # frontend/app/services/api/workspaces.ts # frontend/package.json # frontend/pnpm-lock.yaml # frontend/vite.config.ts
This commit is contained in:
tao.chen