From d53fe2390628caa2ac99424c6961dc6a92aa47ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 13:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
package.json | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package.json b/package.json
index 0ca5c08..24353f4 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
"@delon/auth": "0.6.6",
"@delon/cache": "0.6.6",
"@delon/theme": "0.6.6",
+ "@delon/mock": "^0.6.6",
"@ngx-translate/core": "^9.0.0",
"@ngx-translate/http-loader": "^2.0.0",
"@types/jquery": "^3.3.0",
@@ -69,7 +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-echarts": "^2.2.0",
"ngx-tinymce": "^1.0.1",
"ngx-ueditor": "^1.1.0",
"rxjs": "^5.5.5",
--
Gitblit v1.8.0