Merge branch 'jhc' into dev

api/approval/approval.pb.go

@@ -2507,7 +2507,7 @@ type BundlePayPrice struct {
 	Status         uint64 `protobuf:"varint,11,opt,name=Status,json=status,proto3" json:"Status,omitempty"`
 	ArtistName     string `protobuf:"bytes,12,opt,name=ArtistName,json=artistName,proto3" json:"ArtistName,omitempty"`
 	Rollback       int32  `protobuf:"varint,13,opt,name=Rollback,json=rollback,proto3" json:"Rollback,omitempty"`
-	OperationTimes int32  `protobuf:"varint,14,opt,name=OperationTimes,json=operationTimes,proto3" json:"OperationTimes,omitempty"`
+	OperationTimes int32  `protobuf:"varint,15,opt,name=OperationTimes,json=operationTimes,proto3" json:"OperationTimes,omitempty"`
 }
 
 func (x *BundlePayPrice) Reset() {
@@ -5823,7 +5823,7 @@ var file_api_approval_approval_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65,
 	0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x18, 0x0d, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x08, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x12, 0x26, 0x0a, 0x0e,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x0e,
+	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x0f,
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54,
 	0x69, 0x6d, 0x65, 0x73, 0x22, 0xbc, 0x08, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,

api/approval/approval.proto

@@ -304,7 +304,7 @@ message BundlePayPrice {
   uint64  Status      = 11 [json_name = "status"];
   string  ArtistName  = 12 [json_name = "artistName"];
   int32  Rollback  = 13 [json_name = "rollback"];
-  int32  OperationTimes = 14 [json_name = "operationTimes"];
+  int32  OperationTimes = 15 [json_name = "operationTimes"];
 }
 
 message CreateRequest {