Merge remote-tracking branch 'rem/v3' into v3

2024-12-11 00:34:37 +07:00
parent 12e26d0018 21e5406e96
commit d9eb9e3c66
23 changed files with 1470 additions and 23 deletions
--- a/handler/swagger/swagger.go
+++ b/handler/swagger/swagger.go
@@ -1,11 +1,20 @@
+<<<<<<< HEAD
 package swagger
+=======
+package swagger_handler
+>>>>>>> rem/v3

 import (
 	"io/fs"
 	"net/http"

+<<<<<<< HEAD
 	yamlcodec "go.unistack.org/micro-codec-yaml/v4"
 	rutil "go.unistack.org/micro/v4/util/reflect"
+=======
+	yamlcodec "go.unistack.org/micro-codec-yaml/v3"
+	rutil "go.unistack.org/micro/v3/util/reflect"
+>>>>>>> rem/v3
 )

 // Handler append to generated swagger data from dst map[string]interface{}