Merge branch 'jng' into dev
This commit is contained in:
commit
6a943ed3bd
2
clear.sh
2
clear.sh
@ -1,2 +1,4 @@
|
|||||||
|
protoc --proto_path=. --go_out=./pb --go-triple_out=./pb --govalidators_out=./pb ./pb/bundle.proto
|
||||||
ls pb/bundle/*.pb.go | xargs -n1 -IX bash -c 'sed s/,omitempty// X > X.tmp && mv X{.tmp,}';
|
ls pb/bundle/*.pb.go | xargs -n1 -IX bash -c 'sed s/,omitempty// X > X.tmp && mv X{.tmp,}';
|
||||||
|
|
||||||
|
|
||||||
|
@ -121,6 +121,7 @@ message ReconciliationInfo{
|
|||||||
string serialNumber = 13;
|
string serialNumber = 13;
|
||||||
uint64 userID = 14;
|
uint64 userID = 14;
|
||||||
string handlingFee = 15;
|
string handlingFee = 15;
|
||||||
|
string subNum = 16;
|
||||||
}
|
}
|
||||||
message OrderInfoByOrderNoRequest{
|
message OrderInfoByOrderNoRequest{
|
||||||
string orderNo = 1;
|
string orderNo = 1;
|
||||||
@ -207,6 +208,7 @@ message OrderBundleRecordInfo{
|
|||||||
repeated OrderAddBundleRecordInfo addBundleInfo = 8;
|
repeated OrderAddBundleRecordInfo addBundleInfo = 8;
|
||||||
int64 customerId = 9;
|
int64 customerId = 9;
|
||||||
string payTime = 10;
|
string payTime = 10;
|
||||||
|
string subNum = 11;
|
||||||
}
|
}
|
||||||
message OrderAddBundleRecordInfo{
|
message OrderAddBundleRecordInfo{
|
||||||
string orderAddNo = 1;
|
string orderAddNo = 1;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -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.5
|
||||||
// - protoc v4.24.0--rc1
|
// - protoc v6.32.0
|
||||||
// source: pb/bundle.proto
|
// source: pb/bundle.proto
|
||||||
|
|
||||||
package bundle
|
package bundle
|
||||||
|
Loading…
Reference in New Issue
Block a user