Merge branch 'develop'

Former-commit-id: 6029864179e5031a3422897015df05a6935873be [formerly 6029864179e5031a3422897015df05a6935873be [formerly 6029864179e5031a3422897015df05a6935873be [formerly 6029864179e5031a3422897015df05a6935873be [formerly 0f660a48d07ed1b75797c45e39af747afa47397e [formerly 3514948237fb4541ee0920486aff4214d749c4e4]]]]] Former-commit-id: e5fd19c2902805afb179f1cff76df0ff26575366 Former-commit-id: 0d8b9960fa009110a8c92b3ae659744fed2d84d9 Former-commit-id: d7143c0c0a398dfd62b0662440a871d509ef593e [formerly c43467e2ffddf3662d6db8678fb41d368ed6b90b] Former-commit-id: e6315ed375673cb4fcb6529452c06c48f75b6790 Former-commit-id: a1929c5db4655dd42efd32d95721f2d3fcd57927 Former-commit-id: 5e15be16870f361751bd7a771bd761ae036cdd63 Former-commit-id: e79faf2d537b78d937af93f53c5c07187e55e626 Former-commit-id: 111f1fed9b0dc656adfbd55cd19e7af77f5954b3
2019-03-22 18:52:51 +08:00
parent 9ecec2a780 09eabf1564
commit c2a1daf0ce
3 changed files with 2 additions and 3 deletions
--- a/package-lock.json.REMOVED.git-id
+++ b/package-lock.json.REMOVED.git-id
@@ -1 +1 @@
-e70fb074430d64860b20e72570b4433d34c841f5
+f01ff4e1d57495bdbbf1fdb40488a25710542920
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "d2-admin",
-  "version": "1.6.17",
+  "version": "1.6.18",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --open",
--- a/yarn.lock.REMOVED.git-id
+++ b/yarn.lock.REMOVED.git-id
@@ -1 +0,0 @@
-a1d40ddc768e42b2d219b59487fd95fb5353fdc4