提交

jyBXSubscribe/rpc/bxsubscribe/bxsubscribe.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxsubscribe.proto
 
 package bxsubscribe

jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.15.1
+// - protoc             v3.19.4
 // source: bxsubscribe.proto
 
 package bxsubscribe
@@ -34,11 +34,8 @@ type BxsubscribeClient interface {
 	SetRead(ctx context.Context, in *SetReadReq, opts ...grpc.CallOption) (*StatusResp, error)
 	//关键词获取
 	GetKey(ctx context.Context, in *GetKeyReq, opts ...grpc.CallOption) (*KeyResp, error)
-<<<<<<< HEAD
 	//订阅设置获取
 	GetSubScribeInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResq, error)
-=======
->>>>>>> master
 	//信息分发
 	MsgDistributor(ctx context.Context, in *MsgDistributorReq, opts ...grpc.CallOption) (*StatusResp, error)
 	//手动分发人员查询
@@ -161,11 +158,8 @@ type BxsubscribeServer interface {
 	SetRead(context.Context, *SetReadReq) (*StatusResp, error)
 	//关键词获取
 	GetKey(context.Context, *GetKeyReq) (*KeyResp, error)
-<<<<<<< HEAD
 	//订阅设置获取
 	GetSubScribeInfo(context.Context, *UserReq) (*UserResq, error)
-=======
->>>>>>> master
 	//信息分发
 	MsgDistributor(context.Context, *MsgDistributorReq) (*StatusResp, error)
 	//手动分发人员查询