修改冲突

internal/logic/bundleLogic.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"micro-bundle/internal/dao"
+	"micro-bundle/pb/bundle"
 	"micro-bundle/pkg/app"
 	"micro-bundle/pkg/msg"
 	"time"
@@ -14,7 +15,6 @@ import (
 	"gorm.io/gorm"
 
 	"micro-bundle/internal/model"
-	"micro-bundle/pb/bundle"
 )
 
 func CreateBundle(req *bundle.BundleProfile) (res *bundle.CommonResponse, err error) {

pb/bundle.proto

@@ -416,6 +416,7 @@ message OrderRecordsDetailRequest {
   string orderNo = 2 [json_name = "orderNo"];
   string customerID = 3 [json_name = "customerID"];
   string bundleUUID = 4 [json_name = "bundleUUID"];
+  uint64 status = 5 [json_name = "status"];
 }
 
 message OrderRecordsDetailResponse {
@@ -711,7 +712,7 @@ message WorkCastItem{
   uint32 workCategory = 5;   // 1 图文 2 视频
   string bundleUuid = 6;     // 套餐ID uuid
   string bundleName = 7;     // 套餐名称
-  string platformIDs = 8;    // 发布平台ID集合 (json 格式字符串)
+  string platformIds = 8;    // 发布平台ID集合 (json 格式字符串)
   string mediaNames = 9;     // 自媒体账号名称集合
   string mediaAccIDs = 10;   // 自媒体账号ID集合
   string workTitle = 11;     // 作品标题
@@ -755,7 +756,7 @@ message workItem{
   string content = 4;
   uint32 workCategory = 5;
   uint32 workStatus = 6;
-  string platformIDs = 7;
+  string platformIds = 7;
   string mediaNames = 8; 
   string mediaAccUserIds = 9;
   int64 confirmedAt = 10;    

pb/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"
 )
 

pb/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