Updata：解决冲突

internal/dao/invoiceDao.go

@@ -152,6 +152,7 @@ func GetInvoiceInfoByOrderNo(req *bundle.GetInvoiceInfoByOrderNoReq) (data []*mo
 	data = make([]*model.InvoiceInfoByOrderNo, 0)
 	err = app.ModuleClients.BundleDB.Model(&model.Invoice{}).
 		Select(`
+			invoice.order_no AS order_no,
 			invoice.invoice_no AS invoice_no,
 			invoice.invoice_url AS invoice_url,
 			bor.bundle_name AS bundle_name,

internal/logic/invoiceLogic.go

@@ -95,6 +95,7 @@ func GetInvoiceInfoByOrderNo(req *bundle.GetInvoiceInfoByOrderNoReq) (*bundle.Ge
 	}
 	res.Data = lo.Map(data, func(m *model.InvoiceInfoByOrderNo, _ int) *bundle.InvoiceInfoByOrderNo {
 		return &bundle.InvoiceInfoByOrderNo{
+			OrderNo:            m.OrderNo,
 			InvoiceNo:          m.InvoiceNo,
 			InvoiceUrl:         m.InvoiceUrl,
 			BundleName:         m.BundleName,

pb/bundle.proto

@@ -2263,13 +2263,14 @@ message GetInvoiceInfoByOrderNoReq{
 }
 
 message InvoiceInfoByOrderNo{
-  string invoiceNo = 1;
-  string invoiceUrl = 2;
-  string bundleName = 3;
-  int64 amountType = 4;
-  string totalAmount = 5;
-  string payTime = 6;
-  int64 paperInvocieStatus = 7;
+  string orderNo = 1;
+  string invoiceNo = 2;
+  string invoiceUrl = 3;
+  string bundleName = 4;
+  int64 amountType = 5;
+  string totalAmount = 6;
+  string payTime = 7;
+  int64 paperInvocieStatus = 8;
 }
 
 message GetInvoiceInfoByOrderNoResp{

pb/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/mwitkow/go-proto-validators"
 	_ "google.golang.org/protobuf/types/descriptorpb"
+	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )