Merge remote-tracking branch 'origin/main'

# Conflicts:
#	backend/package.json
This commit is contained in:
2025-09-11 19:55:37 +08:00
67 changed files with 5858 additions and 6960 deletions

View File

@@ -46,10 +46,9 @@
"morgan": "^1.10.1",
"multer": "^1.4.5-lts.1",
"mysql2": "^3.6.0",
"redis": "^4.6.7",
"sequelize": "^6.32.1",
"socket.io": "^4.7.2",
"swagger-jsdoc": "^6.2.8",
"swagger-ui-express": "^5.0.0",
"uuid": "^9.0.0",
"winston": "^3.10.0"
},