解决eslint冲突

Author: MarsQiu007

.gitignore

@@ -30,4 +30,6 @@ src/config/opensource/output/
 /website/public/static/data/echarts/line/
 /website/public/static/data/echarts/point/
 /website/public/static/data/echarts/road/
-/website/public/static/libs/cdn
+/website/public/static/libs/cdn
+
+package-lock.json