Merge main & resolve conflict

adapter/context/context.go

@@ -15,7 +15,7 @@
 // Package context provide the context utils
 // Usage:
 //
-//	import "github.com/beego/beego/v2/context"
+//	import "github.com/beego/beego/v2/server/web/context"
 //
 //	ctx := context.Context{Request:req,ResponseWriter:rw}
 //

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())
 }
-