From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 .angular-cli.json |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/.angular-cli.json b/.angular-cli.json
index 6eaae58..b30914a 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -23,7 +23,8 @@
         "scripts": [
             "../node_modules/@antv/g2/dist/g2.min.js",
             "../node_modules/@antv/data-set/dist/data-set.min.js",
-            "../node_modules/@antv/g2-plugin-slider/dist/g2-plugin-slider.min.js"
+            "../node_modules/@antv/g2-plugin-slider/dist/g2-plugin-slider.min.js",
+            "../node_modules/echarts/dist/echarts.min.js"
         ],
         "environmentSource": "environments/environment.ts",
         "environments": {

--
Gitblit v1.8.0