Merge branch 'master' of http://8.130.126.103:10880/actredphos2017/bk-serve

.gitignore

@@ -54,3 +54,6 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# sb jixin
+package-lock.json