解决冲突

修改
2025-06-25 15:34:14 +08:00 · 2025-06-25 15:32:51 +08:00
3 changed files with 1411 additions and 1401 deletions
--- a/api/bundle/bundle.pb.go
+++ b/api/bundle/bundle.pb.go
--- a/api/bundle/bundle.validator.pb.go
+++ b/api/bundle/bundle.validator.pb.go
@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )

--- a/api/bundle/bundle_triple.pb.go
+++ b/api/bundle/bundle_triple.pb.go
@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v3.20.3
+// - protoc             v4.24.0--rc1
 // source: pb/bundle.proto

 package bundle
Author	SHA1	Message	Date
桀尼龟	ada34794e3	解决冲突	2025-06-25 15:34:14 +08:00
桀尼龟	23cf374c95	修改	2025-06-25 15:32:51 +08:00