Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

Conflicts: server/gva/init_data/init_data.go
2020-10-23 13:27:06 +08:00
parent 9865d53ea7 d478246edc
commit c56e0416f2
54 changed files with 1908 additions and 1216 deletions
@@ -3,7 +3,7 @@
    "version": "0.1.0",
    "private": true,
    "scripts": {
-        "serve": "start https://www.gin-vue-admin.com && vue-cli-service serve",
+        "serve": "node openDocument.js && vue-cli-service serve",
        "build": "vue-cli-service build",
        "lint": "vue-cli-service lint"
    },