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

# Conflicts:
#	package.json
#	pnpm-lock.yaml
This commit is contained in:
2026-04-09 17:24:21 +08:00
+6 -6
View File
@@ -20,23 +20,23 @@
"antd": "^6.3.5", "antd": "^6.3.5",
"axios": "^1.14.0", "axios": "^1.14.0",
"dayjs": "^1.11.20", "dayjs": "^1.11.20",
"react": "^19.2.4", "react": "^19.2.5",
"react-dom": "^19.2.4", "react-dom": "^19.2.5",
"react-redux": "^9.2.0", "react-redux": "^9.2.0",
"react-router": "^7.13.2", "react-router": "^7.14.0",
"react-router-dom": "^7.13.2", "react-router-dom": "^7.14.0",
"redux-persist": "^6.0.0", "redux-persist": "^6.0.0",
"tailwindcss": "^4.2.2" "tailwindcss": "^4.2.2"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^22.19.15", "@types/node": "^22.19.17",
"@types/react": "^19.2.14", "@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-react": "^6.0.1",
"globals": "^17.4.0", "globals": "^17.4.0",
"prettier": "^3.8.1", "prettier": "^3.8.1",
"typescript": "~6.0.2", "typescript": "~6.0.2",
"vite": "^8.0.3" "vite": "^8.0.8"
}, },
"pnpm": { "pnpm": {
"ignoredBuiltDependencies": [ "ignoredBuiltDependencies": [