解决冲突

修改
2025-10-20 15:21:11 +08:00 · 2025-10-20 15:20:46 +08:00
2 changed files with 2483 additions and 5464 deletions
--- a/api/bundle/bundle.pb.go
+++ b/api/bundle/bundle.pb.go
--- 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-gen-go-triple v1.0.5
-// - protoc             v3.12.4
+// - protoc             v6.32.0
 // source: pb/bundle.proto
 package bundle
Author	SHA1	Message	Date
JNG	2b7ad29482	解决冲突	2025-10-20 15:21:11 +08:00
JNG	6a3a565564	修改	2025-10-20 15:20:46 +08:00