Merge branch 'develop'

Former-commit-id: 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 6d31037fc2084f885a0a5baa90c391bba415a532 [formerly 2e213c7a937c94c988c5c1aba88771b66dd62ed9]]]]]
Former-commit-id: 4e5646b719ff6cf9028b5781d9a03e5583a48807
Former-commit-id: 6956978bf112c46406d30b0c3fea6b23d3038da4
Former-commit-id: d6992b7951b4cb0b3f7f505689a43c7224f5a699 [formerly 1bc7a48ad36401ab4c062f443314283fcd790570]
Former-commit-id: da4827bf60a8c8dcd190f8024bb1a881649ecdf7
Former-commit-id: 3f58690b5a7f9c49b6b55400da363ea8359729e9
Former-commit-id: abbf333e810acd4a32f7e8b7761337c6f40e21b6
Former-commit-id: 7b5ba1ac5e5e5221bffaf3d3319f1fe17c6ca073
Former-commit-id: 82ba394a78687f44795b73a0385ef7b9c6389317
This commit is contained in:
liyang
2018-11-06 22:57:42 +08:00

View File

@@ -1,6 +1,6 @@
{
"name": "d2-admin",
"version": "1.5.6",
"version": "1.5.7",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",