Merge branch 'master' into dev

This commit is contained in:
wenjianzhang authored and GitHub committed 2020-04-14 00:33:39 +08:00
commit 45fc174cc2
1 file changed
+1
+1
View File
@@ -2,6 +2,7 @@ package main
import ( import (
"context" "context"
"fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go-admin/config" "go-admin/config"
orm "go-admin/database" orm "go-admin/database"