fix merge err

This commit is contained in:
zhangwenjian committed 2020-04-18 10:53:24 +08:00
1 parent 9a70ea3d09
commit e174f1e740
1 file changed
+3 -3
+3 -3
View File
@@ -4,7 +4,7 @@ import (
"bytes"
_ "github.com/go-sql-driver/mysql" //加载mysql
"github.com/jinzhu/gorm"
config2 "go-admin/config"
"go-admin/tools/config"
"log"
"strconv"
@@ -52,9 +52,9 @@ func Setup() {
panic("db type unknow")
}
if err != nil {
log.Fatalln("%s connect error %v", dbType, err)
log.Fatalln("%s connect error %v", DbType, err)
} else {
log.Println("%s connect success!", dbType)
log.Println("%s connect success!", DbType)
}
log.Println("%s connect success!", DbType)