Merge branch 'develop' of git.ailuowan.com:zzw/lone-services into develop

rpc/admin/admin.proto

@@ -12,6 +12,8 @@ message AdminEditRequest {
   string phone = 5;
   string email = 6;
   repeated int64 roles = 7;
+  int32 type = 8;
+  int64 sale_id = 9;
 }
 
 message StatusRequest {

rpc/admin/pb/admin.pb.go

@@ -31,6 +31,8 @@ type AdminEditRequest struct {
 	Phone         string                 `protobuf:"bytes,5,opt,name=phone,proto3" json:"phone,omitempty"`
 	Email         string                 `protobuf:"bytes,6,opt,name=email,proto3" json:"email,omitempty"`
 	Roles         []int64                `protobuf:"varint,7,rep,packed,name=roles,proto3" json:"roles,omitempty"`
+	Type          int32                  `protobuf:"varint,8,opt,name=type,proto3" json:"type,omitempty"`
+	SaleId        int64                  `protobuf:"varint,9,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -114,6 +116,20 @@ func (x *AdminEditRequest) GetRoles() []int64 {
 	return nil
 }
 
+func (x *AdminEditRequest) GetType() int32 {
+	if x != nil {
+		return x.Type
+	}
+	return 0
+}
+
+func (x *AdminEditRequest) GetSaleId() int64 {
+	if x != nil {
+		return x.SaleId
+	}
+	return 0
+}
+
 type StatusRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -1422,7 +1438,7 @@ var File_admin_admin_proto protoreflect.FileDescriptor
 
 const file_admin_admin_proto_rawDesc = "" +
 	"\n" +
-	"\x11admin/admin.proto\x12\x05admin\x1a\x1cgoogle/api/annotations.proto\"\xac\x01\n" +
+	"\x11admin/admin.proto\x12\x05admin\x1a\x1cgoogle/api/annotations.proto\"\xd9\x01\n" +
 	"\x10AdminEditRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x12\x1a\n" +
@@ -1430,7 +1446,9 @@ const file_admin_admin_proto_rawDesc = "" +
 	"\x06avatar\x18\x04 \x01(\tR\x06avatar\x12\x14\n" +
 	"\x05phone\x18\x05 \x01(\tR\x05phone\x12\x14\n" +
 	"\x05email\x18\x06 \x01(\tR\x05email\x12\x14\n" +
-	"\x05roles\x18\a \x03(\x03R\x05roles\"O\n" +
+	"\x05roles\x18\a \x03(\x03R\x05roles\x12\x12\n" +
+	"\x04type\x18\b \x01(\x05R\x04type\x12\x17\n" +
+	"\asale_id\x18\t \x01(\x03R\x06saleId\"O\n" +
 	"\rStatusRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" +
 	"\x06status\x18\x02 \x01(\x05R\x06status\x12\x16\n" +

rpc/order/order.proto

@@ -49,12 +49,6 @@ message EditAddressRequest {
   int32 type = 8;
 }
 
-message StatusAddressRequest {
-  int64 id = 1;
-  int32 status = 2;
-  string reason = 3;
-}
-
 message EmptyRequest {
 }