Authored by 徐炜

Merge remote-tracking branch 'origin/feature/customerService' into feature/customerService

# Conflicts:
#	package.json
{
"name": "yohobuy-node",
"version": "5.2.12",
"version": "5.2.14",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ... @@ -36,6 +36,7 @@
"body-parser": "^1.15.0",
"captchapng": "0.0.1",
"cheerio": "^0.22.0",
"client-sessions": "^0.7.0",
"compression": "^1.6.2",
"connect-multiparty": "^2.0.0",
"cookie-parser": "^1.4.3",
... ... @@ -58,7 +59,7 @@
"request-promise": "^3.0.0",
"serve-favicon": "^2.3.0",
"uuid": "^2.0.2",
"yoho-node-lib": "0.2.0",
"yoho-node-lib": "0.2.2",
"yoho-zookeeper": "^1.0.4"
},
"devDependencies": {
... ...