Merge branch 'develop'

Former-commit-id: a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly 5bcb80627b66a2c00808bef69b36b843e2922a03 [formerly 2964275a5c8476890ae8b7d72ae294e09e8cf8b7]]]]]
Former-commit-id: 280dfe51d47d3a9cfcd13bcf8fbdcfdee4ce99c3
Former-commit-id: 15a31d01f0300cdbba402f5e8fb420ceeada3735
Former-commit-id: 71f949beb62d94b345b91c1ef46e72ab37c53597 [formerly c4d83b9af57a07cb1a23b3f3c49839a35a943888]
Former-commit-id: 894c444ffdb911f295027afc18d0f2e6f8270cfe
Former-commit-id: f49ae6fb1753844defce74aefcff2adda77dfb36
Former-commit-id: 3d0665f660ccddb1b63218318ffa2840e16109ed
Former-commit-id: 088820e1cf0e37b000699d14b7be74c3936d6040
Former-commit-id: 464605f53726320dbd128a1123dfdea275396fcf
This commit is contained in:
liyang
2019-03-22 19:26:02 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1 +1 @@
f01ff4e1d57495bdbbf1fdb40488a25710542920
43c1678132bcf45bc978f14f60cb37c6e7d7888d

View File

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