fiee/micro-bundle
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fiee:19aa5b89552b84a30620a538c1458c5fbe8a24f6
Branches Tags
fiee:main
fiee:dev
fiee:jng
fiee:feat-zjy-issue-013
fiee:dev-lzh
fiee:feat-zjy-fixbug
fiee:sxy
fiee:feat-zjy-issue-008
fiee:status
fiee:sc
fiee:1.0.5
fiee:1.0.4
fiee:1.03
fiee:1.02
fiee:1.01
..
compare: fiee:c61ab9c0bdb51d2ca8fa49550ee5db06c4d3eb52
Branches Tags
fiee:dev
fiee:jng
fiee:main
fiee:feat-zjy-issue-013
fiee:dev-lzh
fiee:feat-zjy-fixbug
fiee:sxy
fiee:feat-zjy-issue-008
fiee:status
fiee:sc
fiee:1.0.5
fiee:1.0.4
fiee:1.03
fiee:1.02
fiee:1.01

No commits in common. "19aa5b89552b84a30620a538c1458c5fbe8a24f6" and "c61ab9c0bdb51d2ca8fa49550ee5db06c4d3eb52" have entirely different histories.
19aa5b8955 ... c61ab9c0bd

5 changed files with 1831 additions and 1843 deletions
Show Stats Expand all files Collapse all files

1
internal/dao/orderRecordsDao.go
View File

@ -540,7 +540,6 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
Type: int32(addOrder[0].Source), Type: int32(addOrder[0].Source),
UserId: uint64(userID), UserId: uint64(userID),
OrderUUID: addOrder[0].OrderUUID, OrderUUID: addOrder[0].OrderUUID,
UserName: addOrder[0].CustomerName,
} }
for _, item := range addOrder { for _, item := range addOrder {
switch item.ServiceType { switch item.ServiceType {

1
pb/bundle.proto
View File

@ -127,7 +127,6 @@ message OrderInfoByOrderNoResp{
int32 dataNumber = 7; int32 dataNumber = 7;
int32 duration = 8; int32 duration = 8;
string unit = 9; string unit = 9;
string userName = 10;
} }
message OrderCreateRecord{ message OrderCreateRecord{

3646
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

2
pb/bundle/bundle.validator.pb.go
View File

@ -7,8 +7,8 @@ import (
fmt "fmt" fmt "fmt"
math "math" math "math"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
_ "google.golang.org/protobuf/types/descriptorpb"
_ "github.com/mwitkow/go-proto-validators" _ "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 "github.com/mwitkow/go-proto-validators"
) )

2
pb/bundle/bundle_triple.pb.go
View File

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