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

Conflicts: web/package.json
2021-02-14 21:41:34 +08:00
parent c47b3eee2c d278344dd4
commit 0f6613c4a1
15 changed files with 403 additions and 143 deletions
@@ -74,4 +74,4 @@
    "> 1%",
    "last 2 versions"
  ]
-}
+}