Authored by 陈轩

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

... ... @@ -36,8 +36,6 @@
"request-promise": "^3.0.0",
"serve-favicon": "^2.3.0",
"uuid": "^2.0.2",
"vue-loader": "^8.5.3",
"vue-touch": "^1.1.0",
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.1.4",
"yoho-md5": "^2.0.0",
... ...