Merge branch 'hotfix/v' into develop

Former-commit-id: 885583027fde75d6005cd05a838ce457859ae9a5 [formerly 885583027fde75d6005cd05a838ce457859ae9a5 [formerly 885583027fde75d6005cd05a838ce457859ae9a5 [formerly 885583027fde75d6005cd05a838ce457859ae9a5 [formerly dae1aea18083b3fad1370bc280a4e899eed434c9 [formerly 946c4295ab20c542e0a9160ad29c7ecfaee7c54f]]]]]
Former-commit-id: c5f6e6b779b76338510bfafafe8c12a6ecf830ed
Former-commit-id: 88f6fffa713424aec73f78da62be30c941f083df
Former-commit-id: 838a521bc058fecc290c23341b475bd235e9aab0 [formerly 915dda27752b14e8016dcdd1c857ab5658827ec7]
Former-commit-id: 524f6f1a47bea1314e6ecf2791597929191de0b0
Former-commit-id: d812951c7b51c455c3a1d5a8f3dc8bbb3844537f
Former-commit-id: 8c3c381f998616b5f1c4a6d10c478472d0dcbf14
Former-commit-id: 84b85d7ccbf3bfddf8565d2fc8a5807ed40965fc
Former-commit-id: 68bb78ba0a5142537cb4fa93e6ac55a8a1006cdb
This commit is contained in:
liyang
2018-12-26 13:41:24 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1 +1 @@
71f178dfd5db284dc9ddb4e31c02b334cd4e920c
c4ca5b3edc0e26e65873952f9a394c73632c7d43

View File

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