Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer
# Conflicts: # src/biz/member/order.ts # src/main.ts
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
... | @@ -26,11 +26,10 @@ | ... | @@ -26,11 +26,10 @@ |
"sequelize": "^6.35.2", | "sequelize": "^6.35.2", | ||
"svg-captcha": "^1.3.12", | "svg-captcha": "^1.3.12", | ||
"tencentcloud-sdk-nodejs": "^4.0.562", | "tencentcloud-sdk-nodejs": "^4.0.562", | ||
"wechatpay-node-v3": "^2.1.8", | "wechatpay-node-v3": "^2.2.0", | ||
"ws": "^5.2.2", | "ws": "^5.2.2", | ||
"xml2js": "^0.4.23" | "xml2js": "^0.4.23" | ||
}, | }, | ||
"devDependencies": {}, | |||
"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