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

---
 package.json |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/package.json b/package.json
index 5cee727..ac749d3 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "ng2-img-cropper": "^0.9.0",
     "ngx-color-picker": "^5.0.0",
     "ngx-countdown": "^2.0.0",
+    "ngx-echarts": "^2.0.2",
     "ngx-tinymce": "^1.0.1",
     "ngx-ueditor": "^1.1.0",
     "rxjs": "^5.5.5",

--
Gitblit v1.8.0