Merge main & resolve conflict

2021-02-01 00:24:45 +08:00
parent 41d682d878 c41f6dd17b
commit de5c2c9a27
105 changed files with 290 additions and 214 deletions
--- a/client/orm/orm_test.go
+++ b/client/orm/orm_test.go
@@ -21,7 +21,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
 	"io/ioutil"
 	"math"
 	"os"
@@ -32,6 +31,8 @@ import (
 	"testing"
 	"time"

+	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
+
 	"github.com/beego/beego/v2/client/orm/hints"

 	"github.com/stretchr/testify/assert"