server/beego
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into frt/supports_for_4144

Browse Source 
# Conflicts:
#	client/orm/orm_queryset.go
This commit is contained in:
Anker Jam
2021-01-09 21:16:27 +08:00
parent f864e585e1 384364e2f2
commit db4f978982
317 changed files with 3113 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/orm/orm.go
View File

@@ -21,7 +21,7 @@
//
// import (
// "fmt"
// "github.com/astaxie/beego/client/orm"
// "github.com/beego/beego/v2/client/orm"
// _ "github.com/go-sql-driver/mysql" // import your used driver
// )
//
@@ -63,10 +63,10 @@ import (
"reflect"
"time"
"github.com/astaxie/beego/client/orm/hints"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/v2/client/orm/hints"
"github.com/beego/beego/v2/core/utils"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/v2/core/logs"
)
// DebugQueries define the debug