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

# Conflicts:
#	pnpm-lock.yaml
This commit is contained in:
siujamo
2026-05-08 17:38:23 +08:00
3 changed files with 460 additions and 456 deletions
+7 -7
View File
@@ -16,13 +16,13 @@
"@tailwindcss/vite": "^4.2.4",
"@tanstack/react-virtual": "^3.13.24",
"antd": "^6.3.7",
"axios": "^1.15.2",
"axios": "^1.16.0",
"dayjs": "^1.11.20",
"react": "^19.2.5",
"react-dom": "^19.2.5",
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-redux": "^9.2.0",
"react-router": "^7.14.2",
"react-router-dom": "^7.14.2",
"react-router": "^7.15.0",
"react-router-dom": "^7.15.0",
"redux-persist": "^6.0.0",
"tailwindcss": "^4.2.4"
},
@@ -32,10 +32,10 @@
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.1",
"globals": "^17.5.0",
"globals": "^17.6.0",
"prettier": "^3.8.3",
"typescript": "~6.0.3",
"vite": "^8.0.10"
"vite": "^8.0.11"
},
"pnpm": {
"ignoredBuiltDependencies": [