Merge branch 'develop' into 'test'

更新依赖修复菜单复用图标问题 See merge request !76

Merge branch 'develop' into 'test'
9942e3c3 · 姜雷 · f02f0895 · 2cea2a37 · 9942e3c3
Commit 9942e3c3 authored May 06, 2019 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

package.json package.json +1 -1

No files found.
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
    "nprogress": "^0.2.0",
    "popmotion": "^8.1.22",
    "qiniu-js": "^2.2.0",
-    "rym-element-ui": "^0.1.55",
+    "rym-element-ui": "^0.1.56",
    "vue-qr": "^1.2.8",
    "vuedraggable": "^2.16.0",
    "wangeditor": "^3.1.1"