Authored by 陈轩

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

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