Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiDataServer
# Conflicts: # src/config/mysqlTableConfig.ts
Showing
| ... | @@ -23,13 +23,16 @@ | ... | @@ -23,13 +23,16 @@ |
| "nodemailer": "^6.1.1", | "nodemailer": "^6.1.1", | ||
| "qs": "^6.11.0", | "qs": "^6.11.0", | ||
| "request": "^2.88.0", | "request": "^2.88.0", | ||
| "sequelize": "^6.32.1", | "sequelize": "^6.37.7", | ||
| "svg-captcha": "^1.3.12", | "svg-captcha": "^1.3.12", | ||
| "tencentcloud-sdk-nodejs": "^4.0.562", | "tencentcloud-sdk-nodejs": "^4.0.562", | ||
| "ws": "^5.2.2", | "ws": "^5.2.2", | ||
| "xml2js": "^0.4.23" | "xml2js": "^0.4.23" | ||
| }, | }, | ||
| "devDependencies": {}, | "devDependencies": { | ||
| "patch-package": "^8.0.0", | |||
| "typescript": "^5.8.3" | |||
| }, | |||
| "scripts": { | "scripts": { | ||
| "test": "echo \"Error: no test specified\" && exit 1" | "test": "echo \"Error: no test specified\" && exit 1" | ||
| }, | }, | ||
| ... | ... |
Please
register
or
sign in
to comment