merge

api/biService.api

@@ -227,7 +227,6 @@ service biService-api {
 	@handler upFile
 	post /biService/upFile (UpFileReq) returns (biResp)
 
-<<<<<<< HEAD
 	@doc "发送邮件"
 	@handler sendComMail
 	post /biService/sendCommonndMail (SendMailReq) returns (biResp)
@@ -236,8 +235,6 @@ service biService-api {
 	@handler addAcceptance
 	post /biService/addAcceptance (AcceptanceReq) returns (biResp)
 
-}
-=======
 	@doc "创建线索"
 	@handler createClue
 	post /biService/createClueByPhone (CreateClueReq) returns (biResp)
@@ -247,4 +244,3 @@ service biService-api {
 	post /biService/transferClueByPhone (TransferClueReq) returns (biResp)
 }
 
->>>>>>> master

api/internal/handler/routes.go

@@ -17,6 +17,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/biService/ClueAdd",
 				Handler: ClueAddHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/biService/addAcceptance",
+				Handler: addAcceptanceHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/biService/addProject",
@@ -102,6 +107,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/biService/resEmpower",
 				Handler: ResEmpowerHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/biService/sendCommonndMail",
+				Handler: sendComMailHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/biService/sendMail",
@@ -122,16 +132,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/biService/upFile",
 				Handler: upFileHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/biService/sendCommonndMail",
-				Handler: sendComMailHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/biService/addAcceptance",
-				Handler: addAcceptanceHandler(serverCtx),
-			},
 		},
 		rest.WithMaxBytes(104857600),
 	)

api/internal/types/types.go

@@ -1,6 +1,20 @@
 // Code generated by goctl. DO NOT EDIT.
 package types
 
+type AcceptanceReq struct {
+	ProposeType     int64  `json:"proposeType,optional"`
+	Propose_time    string `json:"proposeTime,optional"`
+	Channel         string `json:"channel,optional"`
+	Acceptance_type int64  `json:"acceptanceType,optional"`
+	Status          int64  `json:"status,optional"`
+	Over_time       string `json:"overTime,optional"`
+	Remark          string `json:"remark,optional"`
+	PositionId      int64  `header:"positionId,optional"`
+	DeptId          string `header:"entDeptId,optional"` //部门id
+	EntUserName     string `header:"entUserName,optional"`
+	ParamData       string `json:"paramData,optional"`
+}
+
 type ClueAddReq struct {
 	Phone            string `json:"phone"`
 	Username         string `json:"username,optional"`
@@ -87,6 +101,12 @@ type ResEmpowerReq struct {
 	PositionId   string `json:"positionId"`
 }
 
+type SendMailReq struct {
+	Title   string `json:"title"`
+	Content string `json:"content"`
+	Mails   string `json:"mails"`
+}
+
 type SqlManageReq struct {
 	Id     float64 `json:"id"`
 	Params []Param `json:"params"`
@@ -111,26 +131,6 @@ type UpFileReq struct {
 	FileName   string `form:"fileName"`
 }
 
-type SendMailReq struct {
-	Title   string `json:"title"`
-	Content string `json:"content"`
-	Mails   string `json:"mails"`
-}
-
-type AcceptanceReq struct {
-	ProposeType     int64  `json:"proposeType,optional"`
-	Propose_time    string `json:"proposeTime,optional"`
-	Channel         string `json:"channel,optional"`
-	Acceptance_type int64  `json:"acceptanceType,optional"`
-	Status          int64  `json:"status,optional"`
-	Over_time       string `json:"overTime,optional"`
-	Remark          string `json:"remark,optional"`
-	PositionId      int64  `header:"positionId,optional"`
-	DeptId          string `header:"entDeptId,optional"` //部门id
-	EntUserName     string `header:"entUserName,optional"`
-	ParamData       string `json:"paramData,optional"`
-}
-
 type AddProjectReq struct {
 	PositionId   int64  `header:"positionId,optional"`
 	Source       int64  `json:"source,optional"`

rpc/biService.proto

@@ -273,11 +273,8 @@ service BiService {
 	rpc distributeClueShow (DistributeClueShowReq) returns (DistributeClueShowResp); //批量分配展示
 	rpc sendMail (ExportByDbReq) returns (BiReply); //数据导出(通用)
 	rpc upFile (UpFileReq) returns(BiReply);
-<<<<<<< HEAD
 	rpc sendCommonMail (SendMailReq) returns(BiReply);
 	rpc addAcceptance (AcceptanceReq) returns(AcceptanceResp);
-=======
 	rpc createClueByPhone(CreateCuleReq) returns(BiReply);
 	rpc transferClueByPhone(TransferClueReq) returns(BiReply);
->>>>>>> master
 }

rpc/biservice/biservice.go

@@ -71,13 +71,10 @@ type (
 		DistributeClueShow(ctx context.Context, in *DistributeClueShowReq, opts ...grpc.CallOption) (*DistributeClueShowResp, error)
 		SendMail(ctx context.Context, in *ExportByDbReq, opts ...grpc.CallOption) (*BiReply, error)
 		UpFile(ctx context.Context, in *UpFileReq, opts ...grpc.CallOption) (*BiReply, error)
-<<<<<<< HEAD
 		SendCommonMail(ctx context.Context, in *SendMailReq, opts ...grpc.CallOption) (*BiReply, error)
 		AddAcceptance(ctx context.Context, in *AcceptanceReq, opts ...grpc.CallOption) (*AcceptanceResp, error)
-=======
 		CreateClueByPhone(ctx context.Context, in *CreateCuleReq, opts ...grpc.CallOption) (*BiReply, error)
 		TransferClueByPhone(ctx context.Context, in *TransferClueReq, opts ...grpc.CallOption) (*BiReply, error)
->>>>>>> master
 	}
 
 	defaultBiService struct {
@@ -186,7 +183,6 @@ func (m *defaultBiService) UpFile(ctx context.Context, in *UpFileReq, opts ...gr
 	return client.UpFile(ctx, in, opts...)
 }
 
-<<<<<<< HEAD
 func (m *defaultBiService) SendCommonMail(ctx context.Context, in *SendMailReq, opts ...grpc.CallOption) (*BiReply, error) {
 	client := pb.NewBiServiceClient(m.cli.Conn())
 	return client.SendCommonMail(ctx, in, opts...)
@@ -195,7 +191,8 @@ func (m *defaultBiService) SendCommonMail(ctx context.Context, in *SendMailReq,
 func (m *defaultBiService) AddAcceptance(ctx context.Context, in *AcceptanceReq, opts ...grpc.CallOption) (*AcceptanceResp, error) {
 	client := pb.NewBiServiceClient(m.cli.Conn())
 	return client.AddAcceptance(ctx, in, opts...)
-=======
+}
+
 func (m *defaultBiService) CreateClueByPhone(ctx context.Context, in *CreateCuleReq, opts ...grpc.CallOption) (*BiReply, error) {
 	client := pb.NewBiServiceClient(m.cli.Conn())
 	return client.CreateClueByPhone(ctx, in, opts...)
@@ -204,5 +201,4 @@ func (m *defaultBiService) CreateClueByPhone(ctx context.Context, in *CreateCule
 func (m *defaultBiService) TransferClueByPhone(ctx context.Context, in *TransferClueReq, opts ...grpc.CallOption) (*BiReply, error) {
 	client := pb.NewBiServiceClient(m.cli.Conn())
 	return client.TransferClueByPhone(ctx, in, opts...)
->>>>>>> master
 }

rpc/internal/server/biserviceserver.go

@@ -117,7 +117,6 @@ func (s *BiServiceServer) UpFile(ctx context.Context, in *pb.UpFileReq) (*pb.BiR
 	return l.UpFile(in)
 }
 
-<<<<<<< HEAD
 func (s *BiServiceServer) SendCommonMail(ctx context.Context, in *pb.SendMailReq) (*pb.BiReply, error) {
 	l := logic.NewSendCommonMailLogic(ctx, s.svcCtx)
 	return l.SendCommonMail(in)
@@ -126,7 +125,8 @@ func (s *BiServiceServer) SendCommonMail(ctx context.Context, in *pb.SendMailReq
 func (s *BiServiceServer) AddAcceptance(ctx context.Context, in *pb.AcceptanceReq) (*pb.AcceptanceResp, error) {
 	l := logic.NewAddAcceptanceLogic(ctx, s.svcCtx)
 	return l.AddAcceptance(in)
-=======
+}
+
 func (s *BiServiceServer) CreateClueByPhone(ctx context.Context, in *pb.CreateCuleReq) (*pb.BiReply, error) {
 	l := logic.NewCreateClueByPhoneLogic(ctx, s.svcCtx)
 	return l.CreateClueByPhone(in)
@@ -135,5 +135,4 @@ func (s *BiServiceServer) CreateClueByPhone(ctx context.Context, in *pb.CreateCu
 func (s *BiServiceServer) TransferClueByPhone(ctx context.Context, in *pb.TransferClueReq) (*pb.BiReply, error) {
 	l := logic.NewTransferClueByPhoneLogic(ctx, s.svcCtx)
 	return l.TransferClueByPhone(in)
->>>>>>> master
 }

rpc/pb/biService.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
-// 	protoc        v3.15.1
+// 	protoc-gen-go v1.32.0
+// 	protoc        v4.25.2
 // source: biService.proto
 
 package pb
@@ -2173,16 +2173,11 @@ func (x *UpFileReq) GetFileSize() string {
 	return ""
 }
 
-<<<<<<< HEAD
 type AcceptanceReq struct {
-=======
-type CreateCuleReq struct {
->>>>>>> master
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-<<<<<<< HEAD
 	ProposeType    int64  `protobuf:"varint,1,opt,name=ProposeType,proto3" json:"ProposeType,omitempty"`
 	ProposeTime    string `protobuf:"bytes,2,opt,name=Propose_time,json=ProposeTime,proto3" json:"Propose_time,omitempty"`
 	Channel        string `protobuf:"bytes,3,opt,name=Channel,proto3" json:"Channel,omitempty"`
@@ -2198,16 +2193,6 @@ type CreateCuleReq struct {
 
 func (x *AcceptanceReq) Reset() {
 	*x = AcceptanceReq{}
-=======
-	AppId      string `protobuf:"bytes,1,opt,name=appId,proto3" json:"appId,omitempty"`
-	PositionId int64  `protobuf:"varint,2,opt,name=positionId,proto3" json:"positionId,omitempty"`
-	UserId     string `protobuf:"bytes,3,opt,name=userId,proto3" json:"userId,omitempty"`
-	Phone      string `protobuf:"bytes,4,opt,name=phone,proto3" json:"phone,omitempty"`
-}
-
-func (x *CreateCuleReq) Reset() {
-	*x = CreateCuleReq{}
->>>>>>> master
 	if protoimpl.UnsafeEnabled {
 		mi := &file_biService_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2215,7 +2200,6 @@ func (x *CreateCuleReq) Reset() {
 	}
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
@@ -2223,15 +2207,6 @@ func (x *AcceptanceReq) String() string {
 func (*AcceptanceReq) ProtoMessage() {}
 
 func (x *AcceptanceReq) ProtoReflect() protoreflect.Message {
-=======
-func (x *CreateCuleReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CreateCuleReq) ProtoMessage() {}
-
-func (x *CreateCuleReq) ProtoReflect() protoreflect.Message {
->>>>>>> master
 	mi := &file_biService_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2243,7 +2218,6 @@ func (x *CreateCuleReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-<<<<<<< HEAD
 // Deprecated: Use AcceptanceReq.ProtoReflect.Descriptor instead.
 func (*AcceptanceReq) Descriptor() ([]byte, []int) {
 	return file_biService_proto_rawDescGZIP(), []int{31}
@@ -2266,21 +2240,10 @@ func (x *AcceptanceReq) GetProposeTime() string {
 func (x *AcceptanceReq) GetChannel() string {
 	if x != nil {
 		return x.Channel
-=======
-// Deprecated: Use CreateCuleReq.ProtoReflect.Descriptor instead.
-func (*CreateCuleReq) Descriptor() ([]byte, []int) {
-	return file_biService_proto_rawDescGZIP(), []int{31}
-}
-
-func (x *CreateCuleReq) GetAppId() string {
-	if x != nil {
-		return x.AppId
->>>>>>> master
 	}
 	return ""
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceReq) GetAcceptanceType() int64 {
 	if x != nil {
 		return x.AcceptanceType
@@ -2310,42 +2273,26 @@ func (x *AcceptanceReq) GetRemark() string {
 }
 
 func (x *AcceptanceReq) GetPositionId() int64 {
-=======
-func (x *CreateCuleReq) GetPositionId() int64 {
->>>>>>> master
 	if x != nil {
 		return x.PositionId
 	}
 	return 0
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceReq) GetDeptId() string {
 	if x != nil {
 		return x.DeptId
-=======
-func (x *CreateCuleReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
->>>>>>> master
 	}
 	return ""
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceReq) GetEntUserName() string {
 	if x != nil {
 		return x.EntUserName
-=======
-func (x *CreateCuleReq) GetPhone() string {
-	if x != nil {
-		return x.Phone
->>>>>>> master
 	}
 	return ""
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceReq) GetParamData() string {
 	if x != nil {
 		return x.ParamData
@@ -2354,14 +2301,10 @@ func (x *AcceptanceReq) GetParamData() string {
 }
 
 type AcceptanceResp struct {
-=======
-type TransferClueReq struct {
->>>>>>> master
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-<<<<<<< HEAD
 	ErrorCode int64       `protobuf:"varint,1,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"`
 	ErrorMsg  string      `protobuf:"bytes,2,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`
 	Data      *Acceptance `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
@@ -2369,16 +2312,6 @@ type TransferClueReq struct {
 
 func (x *AcceptanceResp) Reset() {
 	*x = AcceptanceResp{}
-=======
-	PositionId int64  `protobuf:"varint,1,opt,name=positionId,proto3" json:"positionId,omitempty"`
-	UserId     string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"`
-	Phone      string `protobuf:"bytes,3,opt,name=phone,proto3" json:"phone,omitempty"`
-	OrderNo    string `protobuf:"bytes,4,opt,name=orderNo,proto3" json:"orderNo,omitempty"`
-}
-
-func (x *TransferClueReq) Reset() {
-	*x = TransferClueReq{}
->>>>>>> master
 	if protoimpl.UnsafeEnabled {
 		mi := &file_biService_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2386,7 +2319,6 @@ func (x *TransferClueReq) Reset() {
 	}
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
@@ -2394,15 +2326,6 @@ func (x *AcceptanceResp) String() string {
 func (*AcceptanceResp) ProtoMessage() {}
 
 func (x *AcceptanceResp) ProtoReflect() protoreflect.Message {
-=======
-func (x *TransferClueReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransferClueReq) ProtoMessage() {}
-
-func (x *TransferClueReq) ProtoReflect() protoreflect.Message {
->>>>>>> master
 	mi := &file_biService_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2414,7 +2337,6 @@ func (x *TransferClueReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-<<<<<<< HEAD
 // Deprecated: Use AcceptanceResp.ProtoReflect.Descriptor instead.
 func (*AcceptanceResp) Descriptor() ([]byte, []int) {
 	return file_biService_proto_rawDescGZIP(), []int{32}
@@ -2423,21 +2345,10 @@ func (*AcceptanceResp) Descriptor() ([]byte, []int) {
 func (x *AcceptanceResp) GetErrorCode() int64 {
 	if x != nil {
 		return x.ErrorCode
-=======
-// Deprecated: Use TransferClueReq.ProtoReflect.Descriptor instead.
-func (*TransferClueReq) Descriptor() ([]byte, []int) {
-	return file_biService_proto_rawDescGZIP(), []int{32}
-}
-
-func (x *TransferClueReq) GetPositionId() int64 {
-	if x != nil {
-		return x.PositionId
->>>>>>> master
 	}
 	return 0
 }
 
-<<<<<<< HEAD
 func (x *AcceptanceResp) GetErrorMsg() string {
 	if x != nil {
 		return x.ErrorMsg
@@ -2544,37 +2455,162 @@ func (*SendMailReq) Descriptor() ([]byte, []int) {
 func (x *SendMailReq) GetTitle() string {
 	if x != nil {
 		return x.Title
-=======
-func (x *TransferClueReq) GetUserId() string {
-	if x != nil {
-		return x.UserId
->>>>>>> master
 	}
 	return ""
 }
 
-<<<<<<< HEAD
 func (x *SendMailReq) GetContent() string {
 	if x != nil {
 		return x.Content
-=======
-func (x *TransferClueReq) GetPhone() string {
-	if x != nil {
-		return x.Phone
->>>>>>> master
 	}
 	return ""
 }
 
-<<<<<<< HEAD
 func (x *SendMailReq) GetMails() string {
 	if x != nil {
 		return x.Mails
-=======
+	}
+	return ""
+}
+
+type CreateCuleReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AppId      string `protobuf:"bytes,1,opt,name=appId,proto3" json:"appId,omitempty"`
+	PositionId int64  `protobuf:"varint,2,opt,name=positionId,proto3" json:"positionId,omitempty"`
+	UserId     string `protobuf:"bytes,3,opt,name=userId,proto3" json:"userId,omitempty"`
+	Phone      string `protobuf:"bytes,4,opt,name=phone,proto3" json:"phone,omitempty"`
+}
+
+func (x *CreateCuleReq) Reset() {
+	*x = CreateCuleReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_biService_proto_msgTypes[35]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CreateCuleReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CreateCuleReq) ProtoMessage() {}
+
+func (x *CreateCuleReq) ProtoReflect() protoreflect.Message {
+	mi := &file_biService_proto_msgTypes[35]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CreateCuleReq.ProtoReflect.Descriptor instead.
+func (*CreateCuleReq) Descriptor() ([]byte, []int) {
+	return file_biService_proto_rawDescGZIP(), []int{35}
+}
+
+func (x *CreateCuleReq) GetAppId() string {
+	if x != nil {
+		return x.AppId
+	}
+	return ""
+}
+
+func (x *CreateCuleReq) GetPositionId() int64 {
+	if x != nil {
+		return x.PositionId
+	}
+	return 0
+}
+
+func (x *CreateCuleReq) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *CreateCuleReq) GetPhone() string {
+	if x != nil {
+		return x.Phone
+	}
+	return ""
+}
+
+type TransferClueReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PositionId int64  `protobuf:"varint,1,opt,name=positionId,proto3" json:"positionId,omitempty"`
+	UserId     string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"`
+	Phone      string `protobuf:"bytes,3,opt,name=phone,proto3" json:"phone,omitempty"`
+	OrderNo    string `protobuf:"bytes,4,opt,name=orderNo,proto3" json:"orderNo,omitempty"`
+}
+
+func (x *TransferClueReq) Reset() {
+	*x = TransferClueReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_biService_proto_msgTypes[36]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransferClueReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransferClueReq) ProtoMessage() {}
+
+func (x *TransferClueReq) ProtoReflect() protoreflect.Message {
+	mi := &file_biService_proto_msgTypes[36]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransferClueReq.ProtoReflect.Descriptor instead.
+func (*TransferClueReq) Descriptor() ([]byte, []int) {
+	return file_biService_proto_rawDescGZIP(), []int{36}
+}
+
+func (x *TransferClueReq) GetPositionId() int64 {
+	if x != nil {
+		return x.PositionId
+	}
+	return 0
+}
+
+func (x *TransferClueReq) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *TransferClueReq) GetPhone() string {
+	if x != nil {
+		return x.Phone
+	}
+	return ""
+}
+
 func (x *TransferClueReq) GetOrderNo() string {
 	if x != nil {
 		return x.OrderNo
->>>>>>> master
 	}
 	return ""
 }
@@ -2832,7 +2868,6 @@ var file_biService_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
 	0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x53,
 	0x69, 0x7a, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x53,
-<<<<<<< HEAD
 	0x69, 0x7a, 0x65, 0x22, 0xdc, 0x02, 0x0a, 0x0d, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e,
 	0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65,
 	0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x50, 0x72, 0x6f, 0x70,
@@ -2870,7 +2905,22 @@ var file_biService_proto_rawDesc = []byte{
 	0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74,
 	0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65,
 	0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x6d, 0x61, 0x69, 0x6c, 0x73, 0x32, 0x9b, 0x07, 0x0a, 0x09, 0x42, 0x69, 0x53,
+	0x09, 0x52, 0x05, 0x6d, 0x61, 0x69, 0x6c, 0x73, 0x22, 0x73, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x43, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12,
+	0x1e, 0x0a, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x22, 0x79, 0x0a,
+	0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71,
+	0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64,
+	0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x32, 0xfd, 0x07, 0x0a, 0x09, 0x42, 0x69, 0x53,
 	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x0b, 0x6d, 0x79, 0x44, 0x61, 0x74, 0x61,
 	0x41, 0x73, 0x73, 0x65, 0x74, 0x12, 0x0f, 0x2e, 0x4d, 0x79, 0x44, 0x61, 0x74, 0x61, 0x41, 0x73,
 	0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x4d, 0x79, 0x44, 0x61, 0x74, 0x61, 0x41,
@@ -2928,85 +2978,14 @@ var file_biService_proto_rawDesc = []byte{
 	0x65, 0x70, 0x6c, 0x79, 0x12, 0x30, 0x0a, 0x0d, 0x61, 0x64, 0x64, 0x41, 0x63, 0x63, 0x65, 0x70,
 	0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e,
 	0x63, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-=======
-	0x69, 0x7a, 0x65, 0x22, 0x73, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x75, 0x6c,
-	0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73,
-	0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72,
-	0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x22, 0x79, 0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e,
-	0x73, 0x66, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70,
-	0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
-	0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64,
-	0x65, 0x72, 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65,
-	0x72, 0x4e, 0x6f, 0x32, 0xa1, 0x07, 0x0a, 0x09, 0x42, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x30, 0x0a, 0x0b, 0x6d, 0x79, 0x44, 0x61, 0x74, 0x61, 0x41, 0x73, 0x73, 0x65, 0x74,
-	0x12, 0x0f, 0x2e, 0x4d, 0x79, 0x44, 0x61, 0x74, 0x61, 0x41, 0x73, 0x73, 0x65, 0x74, 0x52, 0x65,
-	0x71, 0x1a, 0x10, 0x2e, 0x4d, 0x79, 0x44, 0x61, 0x74, 0x61, 0x41, 0x73, 0x73, 0x65, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x0a, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63,
-	0x74, 0x12, 0x0e, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65,
-	0x71, 0x1a, 0x0f, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09, 0x67, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x49, 0x64, 0x12,
-	0x0e, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x1a,
-	0x0e, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x29, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6c, 0x75, 0x65, 0x12, 0x0c, 0x2e, 0x44, 0x72,
-	0x61, 0x77, 0x43, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x41, 0x64, 0x64, 0x50,
-	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a, 0x04, 0x43, 0x61,
-	0x6c, 0x6c, 0x12, 0x08, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x07, 0x2e, 0x42,
-	0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62,
-	0x75, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x65, 0x12, 0x12, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69,
-	0x62, 0x75, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x41, 0x64,
-	0x64, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x0a,
-	0x63, 0x6c, 0x75, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x0e, 0x2e, 0x43, 0x6c, 0x75,
-	0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x43, 0x6c, 0x75,
-	0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x63,
-	0x6c, 0x75, 0x65, 0x41, 0x64, 0x64, 0x12, 0x0b, 0x2e, 0x43, 0x6c, 0x75, 0x65, 0x41, 0x64, 0x64,
-	0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x2f, 0x0a, 0x0c, 0x63, 0x6c, 0x75, 0x65, 0x49, 0x6d, 0x70, 0x6f,
-	0x72, 0x74, 0x54, 0x74, 0x12, 0x0e, 0x2e, 0x43, 0x6c, 0x75, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72,
-	0x74, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x43, 0x6c, 0x75, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x46, 0x6f, 0x6c,
-	0x6c, 0x6f, 0x77, 0x12, 0x08, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e,
-	0x43, 0x6c, 0x75, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24,
-	0x0a, 0x09, 0x73, 0x71, 0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x12, 0x0d, 0x2e, 0x53, 0x71,
-	0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x12, 0x1e, 0x0a, 0x06, 0x6d, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0a,
-	0x2e, 0x4d, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x0d, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x45,
-	0x78, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x0a, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65,
-	0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x10, 0x61,
-	0x6c, 0x6c, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x12,
-	0x0a, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x24, 0x0a, 0x0b, 0x69, 0x6e, 0x66, 0x6f, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65,
-	0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2b, 0x0a, 0x0e, 0x67,
-	0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x2e,
-	0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x0c, 0x2e, 0x43, 0x6f, 0x6d,
-	0x70, 0x61, 0x6e, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x45, 0x0a, 0x12, 0x64, 0x69, 0x73, 0x74,
-	0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x12, 0x16,
-	0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x65, 0x53,
-	0x68, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62,
-	0x75, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x24, 0x0a, 0x08, 0x73, 0x65, 0x6e, 0x64, 0x4d, 0x61, 0x69, 0x6c, 0x12, 0x0e, 0x2e, 0x45, 0x78,
-	0x70, 0x6f, 0x72, 0x74, 0x42, 0x79, 0x44, 0x62, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1e, 0x0a, 0x06, 0x75, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x12,
-	0x0a, 0x2e, 0x55, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2d, 0x0a, 0x11, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43,
-	0x6c, 0x75, 0x65, 0x42, 0x79, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x0e, 0x2e, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x43, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x12, 0x31, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72,
-	0x43, 0x6c, 0x75, 0x65, 0x42, 0x79, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x10, 0x2e, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e,
-	0x42, 0x69, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
->>>>>>> master
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x11, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x43, 0x6c, 0x75, 0x65, 0x42, 0x79, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x0e, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x43, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x42, 0x69,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x31, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65,
+	0x72, 0x43, 0x6c, 0x75, 0x65, 0x42, 0x79, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x10, 0x2e, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x08,
+	0x2e, 0x42, 0x69, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3021,11 +3000,7 @@ func file_biService_proto_rawDescGZIP() []byte {
 	return file_biService_proto_rawDescData
 }
 
-<<<<<<< HEAD
-var file_biService_proto_msgTypes = make([]protoimpl.MessageInfo, 35)
-=======
-var file_biService_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
->>>>>>> master
+var file_biService_proto_msgTypes = make([]protoimpl.MessageInfo, 37)
 var file_biService_proto_goTypes = []interface{}{
 	(*MyDataAssetReq)(nil),         // 0: MyDataAssetReq
 	(*MyDataAssetResp)(nil),        // 1: MyDataAssetResp
@@ -3058,15 +3033,12 @@ var file_biService_proto_goTypes = []interface{}{
 	(*ExportByDbReq)(nil),          // 28: ExportByDbReq
 	(*FilesData)(nil),              // 29: FilesData
 	(*UpFileReq)(nil),              // 30: UpFileReq
-<<<<<<< HEAD
 	(*AcceptanceReq)(nil),          // 31: AcceptanceReq
 	(*AcceptanceResp)(nil),         // 32: AcceptanceResp
 	(*Acceptance)(nil),             // 33: Acceptance
 	(*SendMailReq)(nil),            // 34: SendMailReq
-=======
-	(*CreateCuleReq)(nil),          // 31: CreateCuleReq
-	(*TransferClueReq)(nil),        // 32: TransferClueReq
->>>>>>> master
+	(*CreateCuleReq)(nil),          // 35: CreateCuleReq
+	(*TransferClueReq)(nil),        // 36: TransferClueReq
 }
 var file_biService_proto_depIdxs = []int32{
 	2,  // 0: MyDataAssetResp.data:type_name -> MyDataAsset
@@ -3077,7 +3049,6 @@ var file_biService_proto_depIdxs = []int32{
 	25, // 5: DistributeClueShowReq.datas:type_name -> DistributeClueShows
 	26, // 6: DistributeClueShowResp.data:type_name -> DistributeClueShowss
 	29, // 7: ExportByDbReq.datas:type_name -> FilesData
-<<<<<<< HEAD
 	33, // 8: AcceptanceResp.data:type_name -> Acceptance
 	0,  // 9: BiService.myDataAsset:input_type -> MyDataAssetReq
 	3,  // 10: BiService.addProject:input_type -> AddProjectReq
@@ -3100,81 +3071,36 @@ var file_biService_proto_depIdxs = []int32{
 	30, // 27: BiService.upFile:input_type -> UpFileReq
 	34, // 28: BiService.sendCommonMail:input_type -> SendMailReq
 	31, // 29: BiService.addAcceptance:input_type -> AcceptanceReq
-	1,  // 30: BiService.myDataAsset:output_type -> MyDataAssetResp
-	4,  // 31: BiService.addProject:output_type -> AddProjectResp
-	6,  // 32: BiService.getInfoId:output_type -> GetInfoIdResp
-	4,  // 33: BiService.drawClue:output_type -> AddProjectResp
-	9,  // 34: BiService.Call:output_type -> BiResp
-	4,  // 35: BiService.distributeClue:output_type -> AddProjectResp
-	14, // 36: BiService.clueImport:output_type -> ClueImportResp
-	4,  // 37: BiService.clueAdd:output_type -> AddProjectResp
-	14, // 38: BiService.clueImportTt:output_type -> ClueImportResp
-	14, // 39: BiService.autoFollow:output_type -> ClueImportResp
-	10, // 40: BiService.sqlManage:output_type -> BiReply
-	10, // 41: BiService.myInfo:output_type -> BiReply
-	10, // 42: BiService.allInfoExport:output_type -> BiReply
-	10, // 43: BiService.allProjectExport:output_type -> BiReply
-	10, // 44: BiService.infoOperate:output_type -> BiReply
-	23, // 45: BiService.getCompanyType:output_type -> CompanyResp
-	27, // 46: BiService.distributeClueShow:output_type -> DistributeClueShowResp
-	10, // 47: BiService.sendMail:output_type -> BiReply
-	10, // 48: BiService.upFile:output_type -> BiReply
-	10, // 49: BiService.sendCommonMail:output_type -> BiReply
-	32, // 50: BiService.addAcceptance:output_type -> AcceptanceResp
-	30, // [30:51] is the sub-list for method output_type
-	9,  // [9:30] is the sub-list for method input_type
+	35, // 30: BiService.createClueByPhone:input_type -> CreateCuleReq
+	36, // 31: BiService.transferClueByPhone:input_type -> TransferClueReq
+	1,  // 32: BiService.myDataAsset:output_type -> MyDataAssetResp
+	4,  // 33: BiService.addProject:output_type -> AddProjectResp
+	6,  // 34: BiService.getInfoId:output_type -> GetInfoIdResp
+	4,  // 35: BiService.drawClue:output_type -> AddProjectResp
+	9,  // 36: BiService.Call:output_type -> BiResp
+	4,  // 37: BiService.distributeClue:output_type -> AddProjectResp
+	14, // 38: BiService.clueImport:output_type -> ClueImportResp
+	4,  // 39: BiService.clueAdd:output_type -> AddProjectResp
+	14, // 40: BiService.clueImportTt:output_type -> ClueImportResp
+	14, // 41: BiService.autoFollow:output_type -> ClueImportResp
+	10, // 42: BiService.sqlManage:output_type -> BiReply
+	10, // 43: BiService.myInfo:output_type -> BiReply
+	10, // 44: BiService.allInfoExport:output_type -> BiReply
+	10, // 45: BiService.allProjectExport:output_type -> BiReply
+	10, // 46: BiService.infoOperate:output_type -> BiReply
+	23, // 47: BiService.getCompanyType:output_type -> CompanyResp
+	27, // 48: BiService.distributeClueShow:output_type -> DistributeClueShowResp
+	10, // 49: BiService.sendMail:output_type -> BiReply
+	10, // 50: BiService.upFile:output_type -> BiReply
+	10, // 51: BiService.sendCommonMail:output_type -> BiReply
+	32, // 52: BiService.addAcceptance:output_type -> AcceptanceResp
+	10, // 53: BiService.createClueByPhone:output_type -> BiReply
+	10, // 54: BiService.transferClueByPhone:output_type -> BiReply
+	32, // [32:55] is the sub-list for method output_type
+	9,  // [9:32] is the sub-list for method input_type
 	9,  // [9:9] is the sub-list for extension type_name
 	9,  // [9:9] is the sub-list for extension extendee
 	0,  // [0:9] is the sub-list for field type_name
-=======
-	0,  // 8: BiService.myDataAsset:input_type -> MyDataAssetReq
-	3,  // 9: BiService.addProject:input_type -> AddProjectReq
-	3,  // 10: BiService.getInfoId:input_type -> AddProjectReq
-	7,  // 11: BiService.drawClue:input_type -> DrawClueReq
-	8,  // 12: BiService.Call:input_type -> CallReq
-	11, // 13: BiService.distributeClue:input_type -> DistributeClueReq
-	13, // 14: BiService.clueImport:input_type -> ClueImportReq
-	16, // 15: BiService.clueAdd:input_type -> ClueAddReq
-	13, // 16: BiService.clueImportTt:input_type -> ClueImportReq
-	8,  // 17: BiService.autoFollow:input_type -> CallReq
-	17, // 18: BiService.sqlManage:input_type -> SqlManageReq
-	18, // 19: BiService.myInfo:input_type -> MyInfoReq
-	20, // 20: BiService.allInfoExport:input_type -> ExportReq
-	20, // 21: BiService.allProjectExport:input_type -> ExportReq
-	21, // 22: BiService.infoOperate:input_type -> OperateReq
-	22, // 23: BiService.getCompanyType:input_type -> CompanyReq
-	24, // 24: BiService.distributeClueShow:input_type -> DistributeClueShowReq
-	28, // 25: BiService.sendMail:input_type -> ExportByDbReq
-	30, // 26: BiService.upFile:input_type -> UpFileReq
-	31, // 27: BiService.createClueByPhone:input_type -> CreateCuleReq
-	32, // 28: BiService.transferClueByPhone:input_type -> TransferClueReq
-	1,  // 29: BiService.myDataAsset:output_type -> MyDataAssetResp
-	4,  // 30: BiService.addProject:output_type -> AddProjectResp
-	6,  // 31: BiService.getInfoId:output_type -> GetInfoIdResp
-	4,  // 32: BiService.drawClue:output_type -> AddProjectResp
-	9,  // 33: BiService.Call:output_type -> BiResp
-	4,  // 34: BiService.distributeClue:output_type -> AddProjectResp
-	14, // 35: BiService.clueImport:output_type -> ClueImportResp
-	4,  // 36: BiService.clueAdd:output_type -> AddProjectResp
-	14, // 37: BiService.clueImportTt:output_type -> ClueImportResp
-	14, // 38: BiService.autoFollow:output_type -> ClueImportResp
-	10, // 39: BiService.sqlManage:output_type -> BiReply
-	10, // 40: BiService.myInfo:output_type -> BiReply
-	10, // 41: BiService.allInfoExport:output_type -> BiReply
-	10, // 42: BiService.allProjectExport:output_type -> BiReply
-	10, // 43: BiService.infoOperate:output_type -> BiReply
-	23, // 44: BiService.getCompanyType:output_type -> CompanyResp
-	27, // 45: BiService.distributeClueShow:output_type -> DistributeClueShowResp
-	10, // 46: BiService.sendMail:output_type -> BiReply
-	10, // 47: BiService.upFile:output_type -> BiReply
-	10, // 48: BiService.createClueByPhone:output_type -> BiReply
-	10, // 49: BiService.transferClueByPhone:output_type -> BiReply
-	29, // [29:50] is the sub-list for method output_type
-	8,  // [8:29] is the sub-list for method input_type
-	8,  // [8:8] is the sub-list for extension type_name
-	8,  // [8:8] is the sub-list for extension extendee
-	0,  // [0:8] is the sub-list for field type_name
->>>>>>> master
 }
 
 func init() { file_biService_proto_init() }
@@ -3556,11 +3482,7 @@ func file_biService_proto_init() {
 			}
 		}
 		file_biService_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-<<<<<<< HEAD
 			switch v := v.(*AcceptanceReq); i {
-=======
-			switch v := v.(*CreateCuleReq); i {
->>>>>>> master
 			case 0:
 				return &v.state
 			case 1:
@@ -3572,7 +3494,6 @@ func file_biService_proto_init() {
 			}
 		}
 		file_biService_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-<<<<<<< HEAD
 			switch v := v.(*AcceptanceResp); i {
 			case 0:
 				return &v.state
@@ -3598,9 +3519,30 @@ func file_biService_proto_init() {
 		}
 		file_biService_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SendMailReq); i {
-=======
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_biService_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CreateCuleReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_biService_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TransferClueReq); i {
->>>>>>> master
 			case 0:
 				return &v.state
 			case 1:
@@ -3618,11 +3560,7 @@ func file_biService_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_biService_proto_rawDesc,
 			NumEnums:      0,
-<<<<<<< HEAD
-			NumMessages:   35,
-=======
-			NumMessages:   33,
->>>>>>> master
+			NumMessages:   37,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

rpc/pb/biService_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.15.1
+// - protoc             v4.25.2
 // source: biService.proto
 
 package pb
@@ -19,29 +19,6 @@ import (
 const _ = grpc.SupportPackageIsVersion7
 
 const (
-<<<<<<< HEAD
-	BiService_MyDataAsset_FullMethodName        = "/BiService/myDataAsset"
-	BiService_AddProject_FullMethodName         = "/BiService/addProject"
-	BiService_GetInfoId_FullMethodName          = "/BiService/getInfoId"
-	BiService_DrawClue_FullMethodName           = "/BiService/drawClue"
-	BiService_Call_FullMethodName               = "/BiService/Call"
-	BiService_DistributeClue_FullMethodName     = "/BiService/distributeClue"
-	BiService_ClueImport_FullMethodName         = "/BiService/clueImport"
-	BiService_ClueAdd_FullMethodName            = "/BiService/clueAdd"
-	BiService_ClueImportTt_FullMethodName       = "/BiService/clueImportTt"
-	BiService_AutoFollow_FullMethodName         = "/BiService/autoFollow"
-	BiService_SqlManage_FullMethodName          = "/BiService/sqlManage"
-	BiService_MyInfo_FullMethodName             = "/BiService/myInfo"
-	BiService_AllInfoExport_FullMethodName      = "/BiService/allInfoExport"
-	BiService_AllProjectExport_FullMethodName   = "/BiService/allProjectExport"
-	BiService_InfoOperate_FullMethodName        = "/BiService/infoOperate"
-	BiService_GetCompanyType_FullMethodName     = "/BiService/getCompanyType"
-	BiService_DistributeClueShow_FullMethodName = "/BiService/distributeClueShow"
-	BiService_SendMail_FullMethodName           = "/BiService/sendMail"
-	BiService_UpFile_FullMethodName             = "/BiService/upFile"
-	BiService_SendCommonMail_FullMethodName     = "/BiService/sendCommonMail"
-	BiService_AddAcceptance_FullMethodName      = "/BiService/addAcceptance"
-=======
 	BiService_MyDataAsset_FullMethodName         = "/BiService/myDataAsset"
 	BiService_AddProject_FullMethodName          = "/BiService/addProject"
 	BiService_GetInfoId_FullMethodName           = "/BiService/getInfoId"
@@ -61,9 +38,10 @@ const (
 	BiService_DistributeClueShow_FullMethodName  = "/BiService/distributeClueShow"
 	BiService_SendMail_FullMethodName            = "/BiService/sendMail"
 	BiService_UpFile_FullMethodName              = "/BiService/upFile"
+	BiService_SendCommonMail_FullMethodName      = "/BiService/sendCommonMail"
+	BiService_AddAcceptance_FullMethodName       = "/BiService/addAcceptance"
 	BiService_CreateClueByPhone_FullMethodName   = "/BiService/createClueByPhone"
 	BiService_TransferClueByPhone_FullMethodName = "/BiService/transferClueByPhone"
->>>>>>> master
 )
 
 // BiServiceClient is the client API for BiService service.
@@ -89,13 +67,10 @@ type BiServiceClient interface {
 	DistributeClueShow(ctx context.Context, in *DistributeClueShowReq, opts ...grpc.CallOption) (*DistributeClueShowResp, error)
 	SendMail(ctx context.Context, in *ExportByDbReq, opts ...grpc.CallOption) (*BiReply, error)
 	UpFile(ctx context.Context, in *UpFileReq, opts ...grpc.CallOption) (*BiReply, error)
-<<<<<<< HEAD
 	SendCommonMail(ctx context.Context, in *SendMailReq, opts ...grpc.CallOption) (*BiReply, error)
 	AddAcceptance(ctx context.Context, in *AcceptanceReq, opts ...grpc.CallOption) (*AcceptanceResp, error)
-=======
 	CreateClueByPhone(ctx context.Context, in *CreateCuleReq, opts ...grpc.CallOption) (*BiReply, error)
 	TransferClueByPhone(ctx context.Context, in *TransferClueReq, opts ...grpc.CallOption) (*BiReply, error)
->>>>>>> master
 }
 
 type biServiceClient struct {
@@ -277,30 +252,36 @@ func (c *biServiceClient) UpFile(ctx context.Context, in *UpFileReq, opts ...grp
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *biServiceClient) SendCommonMail(ctx context.Context, in *SendMailReq, opts ...grpc.CallOption) (*BiReply, error) {
 	out := new(BiReply)
 	err := c.cc.Invoke(ctx, BiService_SendCommonMail_FullMethodName, in, out, opts...)
-=======
-func (c *biServiceClient) CreateClueByPhone(ctx context.Context, in *CreateCuleReq, opts ...grpc.CallOption) (*BiReply, error) {
-	out := new(BiReply)
-	err := c.cc.Invoke(ctx, BiService_CreateClueByPhone_FullMethodName, in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-<<<<<<< HEAD
 func (c *biServiceClient) AddAcceptance(ctx context.Context, in *AcceptanceReq, opts ...grpc.CallOption) (*AcceptanceResp, error) {
 	out := new(AcceptanceResp)
 	err := c.cc.Invoke(ctx, BiService_AddAcceptance_FullMethodName, in, out, opts...)
-=======
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *biServiceClient) CreateClueByPhone(ctx context.Context, in *CreateCuleReq, opts ...grpc.CallOption) (*BiReply, error) {
+	out := new(BiReply)
+	err := c.cc.Invoke(ctx, BiService_CreateClueByPhone_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *biServiceClient) TransferClueByPhone(ctx context.Context, in *TransferClueReq, opts ...grpc.CallOption) (*BiReply, error) {
 	out := new(BiReply)
 	err := c.cc.Invoke(ctx, BiService_TransferClueByPhone_FullMethodName, in, out, opts...)
->>>>>>> master
 	if err != nil {
 		return nil, err
 	}
@@ -330,13 +311,10 @@ type BiServiceServer interface {
 	DistributeClueShow(context.Context, *DistributeClueShowReq) (*DistributeClueShowResp, error)
 	SendMail(context.Context, *ExportByDbReq) (*BiReply, error)
 	UpFile(context.Context, *UpFileReq) (*BiReply, error)
-<<<<<<< HEAD
 	SendCommonMail(context.Context, *SendMailReq) (*BiReply, error)
 	AddAcceptance(context.Context, *AcceptanceReq) (*AcceptanceResp, error)
-=======
 	CreateClueByPhone(context.Context, *CreateCuleReq) (*BiReply, error)
 	TransferClueByPhone(context.Context, *TransferClueReq) (*BiReply, error)
->>>>>>> master
 	mustEmbedUnimplementedBiServiceServer()
 }
 
@@ -401,19 +379,17 @@ func (UnimplementedBiServiceServer) SendMail(context.Context, *ExportByDbReq) (*
 func (UnimplementedBiServiceServer) UpFile(context.Context, *UpFileReq) (*BiReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpFile not implemented")
 }
-<<<<<<< HEAD
 func (UnimplementedBiServiceServer) SendCommonMail(context.Context, *SendMailReq) (*BiReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendCommonMail not implemented")
 }
 func (UnimplementedBiServiceServer) AddAcceptance(context.Context, *AcceptanceReq) (*AcceptanceResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddAcceptance not implemented")
-=======
+}
 func (UnimplementedBiServiceServer) CreateClueByPhone(context.Context, *CreateCuleReq) (*BiReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateClueByPhone not implemented")
 }
 func (UnimplementedBiServiceServer) TransferClueByPhone(context.Context, *TransferClueReq) (*BiReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TransferClueByPhone not implemented")
->>>>>>> master
 }
 func (UnimplementedBiServiceServer) mustEmbedUnimplementedBiServiceServer() {}
 
@@ -770,18 +746,12 @@ func _BiService_UpFile_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
 func _BiService_SendCommonMail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(SendMailReq)
-=======
-func _BiService_CreateClueByPhone_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateCuleReq)
->>>>>>> master
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
 		return srv.(BiServiceServer).SendCommonMail(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -790,32 +760,16 @@ func _BiService_CreateClueByPhone_Handler(srv interface{}, ctx context.Context,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BiServiceServer).SendCommonMail(ctx, req.(*SendMailReq))
-=======
-		return srv.(BiServiceServer).CreateClueByPhone(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: BiService_CreateClueByPhone_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BiServiceServer).CreateClueByPhone(ctx, req.(*CreateCuleReq))
->>>>>>> master
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-<<<<<<< HEAD
 func _BiService_AddAcceptance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AcceptanceReq)
-=======
-func _BiService_TransferClueByPhone_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(TransferClueReq)
->>>>>>> master
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-<<<<<<< HEAD
 		return srv.(BiServiceServer).AddAcceptance(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -824,7 +778,34 @@ func _BiService_TransferClueByPhone_Handler(srv interface{}, ctx context.Context
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BiServiceServer).AddAcceptance(ctx, req.(*AcceptanceReq))
-=======
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _BiService_CreateClueByPhone_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateCuleReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BiServiceServer).CreateClueByPhone(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: BiService_CreateClueByPhone_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BiServiceServer).CreateClueByPhone(ctx, req.(*CreateCuleReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _BiService_TransferClueByPhone_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TransferClueReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
 		return srv.(BiServiceServer).TransferClueByPhone(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
@@ -833,7 +814,6 @@ func _BiService_TransferClueByPhone_Handler(srv interface{}, ctx context.Context
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BiServiceServer).TransferClueByPhone(ctx, req.(*TransferClueReq))
->>>>>>> master
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -922,21 +902,20 @@ var BiService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _BiService_UpFile_Handler,
 		},
 		{
-<<<<<<< HEAD
 			MethodName: "sendCommonMail",
 			Handler:    _BiService_SendCommonMail_Handler,
 		},
 		{
 			MethodName: "addAcceptance",
 			Handler:    _BiService_AddAcceptance_Handler,
-=======
+		},
+		{
 			MethodName: "createClueByPhone",
 			Handler:    _BiService_CreateClueByPhone_Handler,
 		},
 		{
 			MethodName: "transferClueByPhone",
 			Handler:    _BiService_TransferClueByPhone_Handler,
->>>>>>> master
 		},
 	},
 	Streams:  []grpc.StreamDesc{},