Merge branch 'pre' of http://8.140.26.4:10003/caijian/risk-monitor into pre

dfe96c16 · 张伊明 · 77f6dda3 · a24b3052 · dfe96c16
--- a/.gitignore
+++ b/.gitignore
@@ -101,5 +101,3 @@ jspm_packages/
 # Temporary folders
 tmp/
 temp/
+\ No newline at end of file
-
-package-lock.json
\ No newline at end of file