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/adapter/context/param/conv_test.go
+++ b/adapter/context/param/conv_test.go
@@ -39,4 +39,3 @@ func TestConvertParams(t *testing.T) {
 	}, reflect.TypeOf(Demo), ctx)
 	assert.Equal(t, int64(11), res[0].Int())
 }
-