根据pb文件调整接口参数

.gitignore

@@ -33,3 +33,4 @@ yarn-error.log*
 
 /cmd/logs/*.log
 /cmd/runtime/log/*.log
+/build/*

cmd/internal/controller/artistInfo_user.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
@@ -34,9 +33,9 @@ func (a *ArtistInfoUserProvider) FindUsers(ctx context.Context, request *artistI
 func (a *ArtistInfoUserProvider) RegisterUser(ctx context.Context, req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.RegisterUserRespond, err error) {
 	fmt.Println("第一处")
 	//新增邀请码判断 by JJXu 2023-03-07
-	if req.UserInviteCode == "" {
+	//if req.UserInviteCode == "" {
-		return nil, errors.New("邀请码不能为空")
+	//	return nil, errors.New("邀请码不能为空")
-	}
+	//}
 	if rep, err = a.artistInfoLogic.RegisterUser(req); err != nil {
 		return nil, err
 	}
@@ -209,7 +208,7 @@ func (a *ArtistInfoUserProvider) BindArtistId(ctx context.Context, in *artistInf
 	var updateData = map[string]any{
 		"mgmt_artist_id":  in.ArtistId,
 		"mgmt_artist_uid": in.ArtistUid,
-		"fdd_state":       2,
+		//"fdd_state":       2,
 	}
 	if err := db.DB.Model(model.User{}).Where("mgmt_acc_id = ?", in.UserId).Updates(&updateData).Error; err != nil {
 		return &artistInfoUser.BindArtistIdResp{Error: err.Error()}, err

cmd/internal/controller/artistinfo_artshow.go

@@ -21,6 +21,11 @@ type ArtistInfoArtshowProvider struct {
 	videoLogic            logic.ArtshowVideoLogic
 	artistIndexLogic      logic.ArtshowArtistIndexLogic
 	artistSupplementLogic logic.ArtshowArtistSupplementLogic
+	artshowLogic          logic.ArtshowLogic
+}
+
+func (a ArtistInfoArtshowProvider) GetArtshowHistroyList(ctx context.Context, request *artistinfoArtshow.GetArtshowHistroyListRequest) (*artistinfoArtshow.GetArtshowHistroyListResponse, error) {
+	return a.artshowLogic.GetArtshowHistroyList(request)
 }
 
 // ----------------- 画展包-画家补充信息

cmd/internal/dao/artistInfo_user.go

@@ -31,6 +31,7 @@ func RegisterUser(req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.
 		InviteCode:    req.UserInviteCode,
 		Account:       req.Account,
 	}
+	zap.L().Debug(fmt.Sprintf("RegisterUser--user: %+v", user))
 	if err = db.DB.Create(&user).Error; err != nil {
 		zap.L().Error("register user err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
@@ -92,6 +93,8 @@ func CreateUserInfo(req *artistInfoUser.CreateUserInfoRequest) (rep *artistInfoU
 
 	fmt.Println(14)
 	user.ID = req.Id
+	user.TelNum = req.TelNum
+	user.InviteCode = req.InvitedCode
 	// todo 下面部分信息需要转存至画家服务和账号服务
 	//user.Name = req.RealName
 	//user.PenName = req.PenName
@@ -496,6 +499,7 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo
 		Account:        data.Account,
 		CertificateNum: data.CertificateNum,
 		CertificateImg: data.CertificateImg,
+		JoinAssoTime:   data.JoinAssoTime,
 		Photo:          data.Photo,
 		HtmlType:       data.Htmltype,
 		EnvType:        data.Envtype,
@@ -517,6 +521,9 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
 	if req.InvitedCode != "" {
 		tx = tx.Where("invited_code = ?", req.InvitedCode)
 	}
+	if req.MgmtAccountId != 0 {
+		tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccountId)
+	}
 	if req.MgmtArtistUid != "" {
 		tx = tx.Where("mgmt_artist_uid = ?", req.MgmtArtistUid)
 	}
@@ -591,6 +598,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
 			Account:        v.Account,
 			CertificateNum: v.CertificateNum,
 			CertificateImg: v.CertificateImg,
+			JoinAssoTime:   v.JoinAssoTime,
 			Photo:          v.Photo,
 			HtmlType:       v.Htmltype,
 			EnvType:        v.Envtype,
@@ -694,6 +702,9 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
 	if req.EnvType != "" {
 		preUpdateData.Envtype = req.EnvType
 	}
+	if req.JoinAssoTime != "" {
+		preUpdateData.JoinAssoTime = req.JoinAssoTime
+	}
 	//var updateData = model.User{
 	//	Model: model.Model{
 	//		ID:        req.Id,

cmd/internal/dao/artistinfo_artwork.go

@@ -132,7 +132,7 @@ func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest)
 	case artistInfoArtwork.ArtworkQueryMode_NowAuditFlowOfSupplementing: //当前处于补充信息审批阶段的画作
 		tx = tx.Where("status =2 AND audit_flow_index = 3")
 	case artistInfoArtwork.ArtworkQueryMode_AllUnlockArtwork: //所有已解锁的画作(历史画作)
-		tx = tx.Where("status = 3 OR status = 2")
+		tx = tx.Where("status = 3").Order("lock_time desc")
 		//case artistInfoArtwork.ArtworkQueryMode_AllHistoryArtwork: //所有历史画作
 		//	tx = tx.Where("status > 1")
 	}

cmd/internal/logic/artistInfo_user.go

@@ -7,6 +7,7 @@ import (
 	"github.com/fonchain/fonchain-artistinfo/pb/artist"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
 	"github.com/fonchain/fonchain-artistinfo/pkg/service"
+	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
 )
 
 type IArtistInfo interface {
@@ -127,10 +128,17 @@ func (a *ArtistInfoUser) FindUsersUserView(req *artistInfoUser.FindUsersRequest)
 			IdcardFront:       v.IdcardFront,
 			InviterInviteCode: v.InviterInviteCode,
 			InviterRealName:   v.InviterRealName,
+			JoinAssoTime:      v.JoinAssoTime,
 			DeletedAt:         v.DeletedAt,
-			UpdatedAt:         v.UpdatedAt.Unix(),
+			UpdatedAt:         stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms),
-			CreatedAt:         v.CreatedAt.Unix(),
+			CreatedAt:         stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+			CertificateNum:    v.CertificateNum,
+			CertificateImg:    v.CertificateImg,
 			LatestLockTime:    v.LatestLockTime,
+			//BankName:          v.BankName,
+			//BankNum:           v.BankNum,
+			//PenName:           "",
+			//StageName:         "",
 		})
 	}
 	if artistUidList != nil {
@@ -139,6 +147,7 @@ func (a *ArtistInfoUser) FindUsersUserView(req *artistInfoUser.FindUsersRequest)
 			Page:     1,
 			PageSize: int32(len(artistUidList)),
 			Uids:     artistUidList,
+			Gender:   -1,
 		})
 		if err != nil {
 			fmt.Println("错误：GrpcArtistImpl.GetInfoByUuids ", err.Error())
@@ -148,7 +157,8 @@ func (a *ArtistInfoUser) FindUsersUserView(req *artistInfoUser.FindUsersRequest)
 			for i, user := range returnData {
 				if artistValue.Uid == user.ArtistUid {
 					returnData[i].CertificateNum = artistValue.CaaCertNum
-					returnData[i].OpenBank = artistValue.BankNum
+					returnData[i].BankNum = artistValue.BankNum
+					returnData[i].BankName = artistValue.BankName
 					returnData[i].PenName = artistValue.PenName
 					returnData[i].StageName = artistValue.StageName
 					break

cmd/internal/logic/artistinfo_artshow.go

@@ -0,0 +1,80 @@
+// Package logic -----------------------------
+// @file      : artistinfo_artshow.go
+// @author    : JJXu
+// @contact   : wavingbear@163.com
+// @time      : 2023/3/7 15:55
+// -------------------------------------------
+package logic
+
+import (
+	"github.com/fonchain/fonchain-artistinfo/cmd/model"
+	"github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow"
+	db "github.com/fonchain/fonchain-artistinfo/pkg/db"
+	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
+)
+
+type ArtshowLogic struct{}
+
+func (a ArtshowLogic) GetArtshowHistroyList(request *artistinfoArtshow.GetArtshowHistroyListRequest) (data *artistinfoArtshow.GetArtshowHistroyListResponse, err error) {
+	data = &artistinfoArtshow.GetArtshowHistroyListResponse{}
+	var (
+		artworkSupplementList = []model.ArtshowArtistSupplement{}
+	)
+	var (
+		//画家补充信息
+		db_artistSupplement = db.DB.Model(&model.ArtshowArtistSupplement{}).Where("artist_uid = ?", request.ArtistUid).Order("lock_time desc")
+		//画家指数
+		//db_artistIndex = db.DB.Model(&model.ArtshowArtistIndex{}).Where("artist_uid = ?", request.ArtistUid).Order("lock_time desc")
+		////画作补充西悉尼
+		//db_artworkSupplement = db.DB.Model(&model.ArtworkLockRecord{})
+	)
+	if request.AuditStatus != 0 {
+		db_artistSupplement = db_artistSupplement.Where("audit_status = ?", request.AuditStatus)
+	}
+
+	err = db_artistSupplement.Find(&artworkSupplementList).Error
+	if err != nil {
+		return nil, err
+	}
+	var dataGroups = []artistinfoArtshow.TimeGroup{}
+	var thisTime = ""
+	var thisIndex = -1
+	for _, v := range artworkSupplementList {
+		if thisTime == "" || v.LockTime != thisTime {
+			thisTime = v.LockTime
+			thisIndex++
+		}
+
+		dataGroups = append(dataGroups, artistinfoArtshow.TimeGroup{
+			Time:                  thisTime,
+			ArtworkSupplementList: []*artistinfoArtshow.ArtworkSupplementData{},
+			ArtistSupplementList:  []*artistinfoArtshow.ArtistSupplementData{},
+			ArtistIndexList:       []*artistinfoArtshow.ArtistIndexData{},
+			ArtistVideoList:       []*artistinfoArtshow.ArtistVideoData{},
+		})
+
+		dataGroups[thisIndex].ArtworkSupplementList = append(dataGroups[thisIndex].ArtworkSupplementList, &artistinfoArtshow.ArtworkSupplementData{
+			ArtistUid:       v.ArtistUid,
+			Status:          v.Status,
+			LockTime:        v.LockTime,
+			AuditStatus:     int64(v.AuditStatus),
+			AuditMark1:      v.AuditMark1,
+			AuditMark2:      v.AuditMark2,
+			ArtistName:      v.ArtistName,
+			ArtistProfile:   v.ArtistProfile,
+			CountryArtLevel: v.CountryArtLevel,
+			ArtistCertPic:   v.ArtistCertPic,
+			BankNum:         v.BankNum,
+			BankName:        v.BankName,
+			Id:              v.ID,
+			CreatedAt:       stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+			UpdatedAt:       stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+			DeletedAt:       int64(v.DeletedAt),
+		})
+	}
+
+	//查询画家补充信息
+	var artistSupplementDatas []model.ArtshowArtistSupplement
+	db.DB.Where("status = ?").Order("").Find(&artistSupplementDatas)
+	return nil, nil
+}

cmd/model/user.go

@@ -12,6 +12,7 @@ type User struct {
 	Account        string  `gorm:"column:account;varchar(191);comment:账号"`
 	CertificateNum string  `gorm:"column:certificate_num;type:varchar(16);comment:中美协会证书编号"`
 	CertificateImg string  `gorm:"column:certificate_img;type:varchar(512);comment:中美协会证书url"`
+	JoinAssoTime   string  `json:"joinAssoTime" gorm:"column:join_asso_time;comment:入会时间"`
 	Photo          string  `gorm:"column:photo;type:varchar(255);comment:个人近照"`
 
 	// 实名认证

cmd/model/user_view.go

@@ -31,11 +31,16 @@ type UserView struct {
 	RealAddress       string    `json:"address" gorm:"column:real_address;comment:真实地址"`
 	IdcardBack        string    `json:"idcardBack" gorm:"column:idcard_back;comment:身份证背面"`
 	IdcardFront       string    `json:"idcard_front" gorm:"column:idcard_front;comment:身份证反面"`
+	JoinAssoTime      string    `json:"joinAssoTime" gorm:"column:join_asso_time;comment:入会时间"`
 	InviterInviteCode string    `json:"inviterInviteCode" gorm:"column:inviter_invite_code;comment:邀请人的邀请码"`
 	InviterRealName   string    `json:"inviterRealName" gorm:"column:inviter_name;comment:邀请人的真实姓名"`
 	CreatedAt         time.Time `json:"createdAt" gorm:"column:created_at;comment:"`
 	UpdatedAt         time.Time `json:"updatedAt" gorm:"column:updated_at;comment:"`
 	DeletedAt         int64     `json:"deletedAt" gorm:"column:deleted_at;comment:"`
+	CertificateNum    string    `json:"certificateNum" gorm:"column:certificate_num;comment:"`
+	CertificateImg    string    `json:"certificateImg" gorm:"column:certificate_img;comment:"`
+	BankName          string    `json:"bank_name" gorm:"column:bank_name;comment:"`
+	BankNum           string    `json:"bank_num" gorm:"column:bank_num;comment:"`
 }
 
 func (u UserView) TableName() string {
@@ -68,7 +73,11 @@ SELECT
  su.deleted_at,
  inviter.invited_code inviter_invite_code,
  inviter_rn.name inviter_name,
- su.latest_lock_time
+ su.latest_lock_time,
+ su.join_asso_time,
+ su.certificate_num,
+ su.certificate_img
+
 FROM sys_user su
 LEFT JOIN real_name rn ON rn.id  = su.real_name_id 
 -- 邀请者信息

pb/artist/artist.validator.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: pb/artist/artist.proto
+// source: pb/artist.proto
 
 package artist
 
@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/mwitkow/go-proto-validators"
 	_ "google.golang.org/protobuf/types/descriptorpb"
+	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 
@@ -435,3 +435,48 @@ func (this *GetCardIdWithImgReq) Validate() error {
 func (this *GetCardIdWithImgResp) Validate() error {
 	return nil
 }
+func (this *ArtistDetailDataReq) Validate() error {
+	return nil
+}
+func (this *ArtistDetailDataResp) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *ArtistDetailDataResp_Info) Validate() error {
+	if this.ProfileInfo != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.ProfileInfo); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("ProfileInfo", err)
+		}
+	}
+	if this.MediaInfo != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.MediaInfo); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("MediaInfo", err)
+		}
+	}
+	for _, item := range this.HonorInfo {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("HonorInfo", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *IdcardConvertArtistIdRequest) Validate() error {
+	return nil
+}
+func (this *IdcardConvertArtistIdResponse) Validate() error {
+	return nil
+}
+func (this *CheckCaaCertNumRequest) Validate() error {
+	return nil
+}
+func (this *CheckCaaCertNumResponse) Validate() error {
+	return nil
+}

pb/artist/artist_triple.pb.go

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.22.0--rc2
+// - protoc             v3.21.1
-// source: pb/artist/artist.proto
+// source: pb/artist.proto
 
 package artist
 
@@ -57,6 +57,7 @@ type ArtistClient interface {
 	GetCardIdWithImg(ctx context.Context, in *GetCardIdWithImgReq, opts ...grpc_go.CallOption) (*GetCardIdWithImgResp, common.ErrorWithAttachment)
 	IdcardConvertArtistId(ctx context.Context, in *IdcardConvertArtistIdRequest, opts ...grpc_go.CallOption) (*IdcardConvertArtistIdResponse, common.ErrorWithAttachment)
 	CheckCaaCertNum(ctx context.Context, in *CheckCaaCertNumRequest, opts ...grpc_go.CallOption) (*CheckCaaCertNumResponse, common.ErrorWithAttachment)
+	ArtistDetailData(ctx context.Context, in *ArtistDetailDataReq, opts ...grpc_go.CallOption) (*ArtistDetailDataResp, common.ErrorWithAttachment)
 }
 
 type artistClient struct {
@@ -93,6 +94,7 @@ type ArtistClientImpl struct {
 	GetCardIdWithImg      func(ctx context.Context, in *GetCardIdWithImgReq) (*GetCardIdWithImgResp, error)
 	IdcardConvertArtistId func(ctx context.Context, in *IdcardConvertArtistIdRequest) (*IdcardConvertArtistIdResponse, error)
 	CheckCaaCertNum       func(ctx context.Context, in *CheckCaaCertNumRequest) (*CheckCaaCertNumResponse, error)
+	ArtistDetailData      func(ctx context.Context, in *ArtistDetailDataReq) (*ArtistDetailDataResp, error)
 }
 
 func (c *ArtistClientImpl) GetDubboStub(cc *triple.TripleConn) ArtistClient {
@@ -281,6 +283,12 @@ func (c *artistClient) CheckCaaCertNum(ctx context.Context, in *CheckCaaCertNumR
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CheckCaaCertNum", in, out)
 }
 
+func (c *artistClient) ArtistDetailData(ctx context.Context, in *ArtistDetailDataReq, opts ...grpc_go.CallOption) (*ArtistDetailDataResp, common.ErrorWithAttachment) {
+	out := new(ArtistDetailDataResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ArtistDetailData", in, out)
+}
+
 // ArtistServer is the server API for Artist service.
 // All implementations must embed UnimplementedArtistServer
 // for forward compatibility
@@ -314,6 +322,7 @@ type ArtistServer interface {
 	GetCardIdWithImg(context.Context, *GetCardIdWithImgReq) (*GetCardIdWithImgResp, error)
 	IdcardConvertArtistId(context.Context, *IdcardConvertArtistIdRequest) (*IdcardConvertArtistIdResponse, error)
 	CheckCaaCertNum(context.Context, *CheckCaaCertNumRequest) (*CheckCaaCertNumResponse, error)
+	ArtistDetailData(context.Context, *ArtistDetailDataReq) (*ArtistDetailDataResp, error)
 	mustEmbedUnimplementedArtistServer()
 }
 
@@ -409,6 +418,9 @@ func (UnimplementedArtistServer) IdcardConvertArtistId(context.Context, *IdcardC
 func (UnimplementedArtistServer) CheckCaaCertNum(context.Context, *CheckCaaCertNumRequest) (*CheckCaaCertNumResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckCaaCertNum not implemented")
 }
+func (UnimplementedArtistServer) ArtistDetailData(context.Context, *ArtistDetailDataReq) (*ArtistDetailDataResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ArtistDetailData not implemented")
+}
 func (s *UnimplementedArtistServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -1278,6 +1290,35 @@ func _Artist_CheckCaaCertNum_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Artist_ArtistDetailData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ArtistDetailDataReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("ArtistDetailData", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Artist_ServiceDesc is the grpc_go.ServiceDesc for Artist service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1401,7 +1442,11 @@ var Artist_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "CheckCaaCertNum",
 			Handler:    _Artist_CheckCaaCertNum_Handler,
 		},
+		{
+			MethodName: "ArtistDetailData",
+			Handler:    _Artist_ArtistDetailData_Handler,
+		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "pb/artist/artist.proto",
+	Metadata: "pb/artist.proto",
 }

pb/artistInfoUser/artistinfoUser.pb.go

@@ -3303,6 +3303,7 @@ type FindUsersRequest struct {
 	IsArtist       bool     `protobuf:"varint,9,opt,name=isArtist,proto3" json:"isArtist,omitempty"` //查询有艺术家uid的数据
 	MgmtArtistUids []string `protobuf:"bytes,10,rep,name=mgmtArtistUids,proto3" json:"mgmtArtistUids,omitempty"`
 	IsLock         bool     `protobuf:"varint,11,opt,name=isLock,proto3" json:"isLock,omitempty"`
+	MgmtAccountId  int64    `protobuf:"varint,12,opt,name=mgmtAccountId,proto3" json:"mgmtAccountId,omitempty"`
 }
 
 func (x *FindUsersRequest) Reset() {
@@ -3400,6 +3401,13 @@ func (x *FindUsersRequest) GetIsLock() bool {
 	return false
 }
 
+func (x *FindUsersRequest) GetMgmtAccountId() int64 {
+	if x != nil {
+		return x.MgmtAccountId
+	}
+	return 0
+}
+
 type FindUsersResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3608,6 +3616,7 @@ type UserInfo struct {
 	InviteCode     string `protobuf:"bytes,27,opt,name=inviteCode,proto3" json:"inviteCode,omitempty"`
 	MgmtArtistId   int64  `protobuf:"varint,28,opt,name=mgmtArtistId,proto3" json:"mgmtArtistId,omitempty"`    //艺术家id
 	LatestLockTime string `protobuf:"bytes,29,opt,name=latestLockTime,proto3" json:"latestLockTime,omitempty"` //最近一次上锁时间
+	JoinAssoTime   string `protobuf:"bytes,32,opt,name=joinAssoTime,proto3" json:"joinAssoTime,omitempty"`
 	// 手机号更新用
 	Domain  string `protobuf:"bytes,30,opt,name=domain,proto3" json:"domain,omitempty"`
 	VerCode string `protobuf:"bytes,31,opt,name=verCode,proto3" json:"verCode,omitempty"`
@@ -3827,6 +3836,13 @@ func (x *UserInfo) GetLatestLockTime() string {
 	return ""
 }
 
+func (x *UserInfo) GetJoinAssoTime() string {
+	if x != nil {
+		return x.JoinAssoTime
+	}
+	return ""
+}
+
 func (x *UserInfo) GetDomain() string {
 	if x != nil {
 		return x.Domain
@@ -4056,14 +4072,17 @@ type UserView struct {
 	IdcardFront       string `protobuf:"bytes,18,opt,name=idcard_front,json=idcardFront,proto3" json:"idcard_front,omitempty"`
 	InviterInviteCode string `protobuf:"bytes,19,opt,name=inviterInviteCode,proto3" json:"inviterInviteCode,omitempty"`
 	InviterRealName   string `protobuf:"bytes,20,opt,name=inviterRealName,proto3" json:"inviterRealName,omitempty"`
+	JoinAssoTime      string `protobuf:"bytes,29,opt,name=joinAssoTime,proto3" json:"joinAssoTime,omitempty"`
 	DeletedAt         int64  `protobuf:"varint,21,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"`
-	UpdatedAt         int64  `protobuf:"varint,22,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"`
+	UpdatedAt         string `protobuf:"bytes,22,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"`
-	CreatedAt         int64  `protobuf:"varint,23,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	CreatedAt         string `protobuf:"bytes,23,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
 	PenName           string `protobuf:"bytes,24,opt,name=penName,proto3" json:"penName,omitempty"`
 	StageName         string `protobuf:"bytes,25,opt,name=stageName,proto3" json:"stageName,omitempty"`
 	CertificateNum    string `protobuf:"bytes,26,opt,name=certificateNum,proto3" json:"certificateNum,omitempty"`
-	OpenBank          string `protobuf:"bytes,27,opt,name=openBank,proto3" json:"openBank,omitempty"`
+	CertificateImg    string `protobuf:"bytes,30,opt,name=certificateImg,proto3" json:"certificateImg,omitempty"`
-	LatestLockTime    string `protobuf:"bytes,28,opt,name=latestLockTime,proto3" json:"latestLockTime,omitempty"`
+	BankName          string `protobuf:"bytes,27,opt,name=bankName,proto3" json:"bankName,omitempty"`
+	BankNum           string `protobuf:"bytes,28,opt,name=bankNum,proto3" json:"bankNum,omitempty"`
+	LatestLockTime    string `protobuf:"bytes,31,opt,name=latestLockTime,proto3" json:"latestLockTime,omitempty"`
 }
 
 func (x *UserView) Reset() {
@@ -4238,6 +4257,13 @@ func (x *UserView) GetInviterRealName() string {
 	return ""
 }
 
+func (x *UserView) GetJoinAssoTime() string {
+	if x != nil {
+		return x.JoinAssoTime
+	}
+	return ""
+}
+
 func (x *UserView) GetDeletedAt() int64 {
 	if x != nil {
 		return x.DeletedAt
@@ -4245,18 +4271,18 @@ func (x *UserView) GetDeletedAt() int64 {
 	return 0
 }
 
-func (x *UserView) GetUpdatedAt() int64 {
+func (x *UserView) GetUpdatedAt() string {
 	if x != nil {
 		return x.UpdatedAt
 	}
-	return 0
+	return ""
 }
 
-func (x *UserView) GetCreatedAt() int64 {
+func (x *UserView) GetCreatedAt() string {
 	if x != nil {
 		return x.CreatedAt
 	}
-	return 0
+	return ""
 }
 
 func (x *UserView) GetPenName() string {
@@ -4280,9 +4306,23 @@ func (x *UserView) GetCertificateNum() string {
 	return ""
 }
 
-func (x *UserView) GetOpenBank() string {
+func (x *UserView) GetCertificateImg() string {
 	if x != nil {
-		return x.OpenBank
+		return x.CertificateImg
+	}
+	return ""
+}
+
+func (x *UserView) GetBankName() string {
+	if x != nil {
+		return x.BankName
+	}
+	return ""
+}
+
+func (x *UserView) GetBankNum() string {
+	if x != nil {
+		return x.BankNum
 	}
 	return ""
 }
@@ -5060,7 +5100,7 @@ var file_pb_artistinfoUser_proto_rawDesc = []byte{
 	0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1a,
 	0x0a, 0x08, 0x69, 0x73, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x08, 0x69, 0x73, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x22, 0xb0, 0x02, 0x0a, 0x10, 0x46,
+	0x52, 0x08, 0x69, 0x73, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x10, 0x46,
 	0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x24, 0x0a, 0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69,
@@ -5079,162 +5119,173 @@ var file_pb_artistinfoUser_proto_rawDesc = []byte{
 	0x0e, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x73, 0x18,
 	0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73,
 	0x74, 0x55, 0x69, 0x64, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x22, 0x71, 0x0a,
+	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x24, 0x0a,
-	0x11, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x0c,
-	0x73, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-	0x32, 0x14, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73,
+	0x74, 0x49, 0x64, 0x22, 0x71, 0x0a, 0x11, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73,
-	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x04,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x72, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69,
-	0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d,
+	0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61,
-	0x6f, 0x6e, 0x50, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65,
+	0x74, 0x61, 0x12, 0x32, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x22, 0xfc, 0x01, 0x0a, 0x0c, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x66,
+	0x32, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73,
-	0x6f, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x02,
+	0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x22, 0xfc, 0x01, 0x0a, 0x0c, 0x52, 0x65, 0x61, 0x6c, 0x4e,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x49, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x54,
+	0x61, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
-	0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x54, 0x65, 0x6c,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x49,
-	0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x46, 0x72, 0x6f,
+	0x64, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x49, 0x64, 0x4e, 0x75,
-	0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64,
+	0x6d, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x46, 0x72, 0x6f, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x42,
+	0x09, 0x52, 0x06, 0x54, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x49, 0x64, 0x43,
-	0x61, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x49, 0x64, 0x43, 0x61, 0x72,
+	0x61, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x64, 0x42, 0x61, 0x63, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x41, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01,
+	0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x49,
-	0x28, 0x05, 0x52, 0x03, 0x41, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x53, 0x65, 0x78, 0x18, 0x07,
+	0x64, 0x43, 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x53, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x42, 0x69, 0x72,
+	0x0a, 0x49, 0x64, 0x43, 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x41,
-	0x74, 0x68, 0x64, 0x61, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x42, 0x69, 0x72,
+	0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x41, 0x67, 0x65, 0x12, 0x10, 0x0a,
-	0x74, 0x68, 0x64, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x03, 0x53, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x53, 0x65, 0x78, 0x12,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
+	0x1a, 0x0a, 0x08, 0x42, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x49, 0x64, 0x22,
+	0x09, 0x52, 0x08, 0x42, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x41,
-	0xe2, 0x06, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x03, 0x52, 0x02, 0x49, 0x64, 0x22, 0x86, 0x07, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
-	0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70,
+	0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
-	0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75,
+	0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74,
-	0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65,
+	0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x03, 0x20,
-	0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c,
-	0x63, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41,
+	0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x63, 0x63, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69,
+	0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09,
-	0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x67, 0x6d,
+	0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65,
+	0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x67,
-	0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x4e,
+	0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64,
+	0x09, 0x52, 0x0d, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64,
-	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64,
+	0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
-	0x43, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x4e,
+	0x52, 0x06, 0x74, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x76, 0x69,
-	0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74,
+	0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69,
-	0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x61, 0x6c,
+	0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x73, 0x52, 0x65,
+	0x76, 0x69, 0x74, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61,
+	0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x6d, 0x65, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x61, 0x6c,
+	0x69, 0x73, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03,
-	0x4e, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61,
+	0x52, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73,
+	0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03,
-	0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x49, 0x6e,
+	0x52, 0x0a, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x08,
-	0x66, 0x6f, 0x52, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,
+	0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18,
-	0x66, 0x64, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
+	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x61, 0x6c,
-	0x66, 0x64, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74,
+	0x4e, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61,
-	0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75,
+	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x64, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0d,
-	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x70, 0x65, 0x6e,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x66, 0x64, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e,
-	0x49, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64,
+	0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01,
-	0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03,
+	0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16,
-	0x52, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x6f,
+	0x0a, 0x06, 0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x63, 0x6b, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b,
+	0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64,
-	0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28,
+	0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x16,
-	0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65,
+	0x0a, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x16, 0x20, 0x01,
+	0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-	0x28, 0x09, 0x52, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e,
+	0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e,
-	0x65, 0x49, 0x6d, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x65, 0x72, 0x74,
+	0x75, 0x6d, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65, 0x72, 0x74,
-	0x6f, 0x74, 0x6f, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f,
+	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09,
-	0x12, 0x1a, 0x0a, 0x08, 0x68, 0x74, 0x6d, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x19, 0x20, 0x01,
+	0x52, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x67,
-	0x28, 0x09, 0x52, 0x08, 0x68, 0x74, 0x6d, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x65, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65,
+	0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x74, 0x6d, 0x6c, 0x54, 0x79,
-	0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65,
+	0x70, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x74, 0x6d, 0x6c, 0x54, 0x79,
-	0x43, 0x6f, 0x64, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x76, 0x69,
+	0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x18, 0x1a, 0x20,
-	0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6d, 0x67,
+	0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09,
-	0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x61,
+	0x52, 0x0a, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a, 0x0c,
-	0x74, 0x65, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x1d, 0x20, 0x01,
+	0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64, 0x18, 0x1c, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69,
+	0x28, 0x03, 0x52, 0x0c, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x64,
-	0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x1e, 0x20, 0x01,
+	0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69,
-	0x28, 0x09, 0x52, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65,
+	0x6d, 0x65, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74,
-	0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72,
+	0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x6a, 0x6f, 0x69, 0x6e,
-	0x43, 0x6f, 0x64, 0x65, 0x22, 0xf3, 0x02, 0x0a, 0x15, 0x50, 0x72, 0x65, 0x53, 0x61, 0x76, 0x65,
+	0x41, 0x73, 0x73, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c,
+	0x6a, 0x6f, 0x69, 0x6e, 0x41, 0x73, 0x73, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x0a, 0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x6f,
-	0x03, 0x52, 0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6d, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xf3,
-	0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x02, 0x0a, 0x15, 0x50, 0x72, 0x65, 0x53, 0x61, 0x76, 0x65, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74,
-	0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64,
+	0x49, 0x6e, 0x66, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x67, 0x6d, 0x74,
-	0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72,
+	0x41, 0x63, 0x63, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x67, 0x6d,
-	0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61,
+	0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6c, 0x61, 0x63,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50,
+	0x72, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64,
-	0x6c, 0x61, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01,
-	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14,
+	0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67,
-	0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x68, 0x6f, 0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
+	0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1c,
+	0x09, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x12, 0x18,
-	0x0a, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x0a, 0x07, 0x70, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
+	0x07, 0x70, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e,
-	0x63, 0x61, 0x61, 0x43, 0x65, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09,
+	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x18,
-	0x52, 0x0a, 0x63, 0x61, 0x61, 0x43, 0x65, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b,
+	0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x63, 0x61, 0x61, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
+	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x67,
-	0x09, 0x52, 0x0b, 0x63, 0x61, 0x61, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a,
+	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61,
-	0x0a, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x53, 0x68, 0x6f, 0x77, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05,
+	0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x61, 0x61, 0x43, 0x65, 0x72,
-	0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x53, 0x68, 0x6f, 0x77, 0x22, 0x3b, 0x0a, 0x1b, 0x47, 0x65,
+	0x74, 0x4e, 0x75, 0x6d, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x61, 0x61, 0x43,
-	0x74, 0x50, 0x72, 0x65, 0x53, 0x61, 0x76, 0x65, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e,
+	0x65, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x61, 0x61, 0x4a, 0x6f, 0x69,
-	0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x67, 0x6d,
+	0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x61, 0x61,
-	0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x67,
+	0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6a, 0x6f, 0x69, 0x6e,
-	0x6d, 0x74, 0x41, 0x63, 0x63, 0x49, 0x64, 0x22, 0xb4, 0x06, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72,
+	0x53, 0x68, 0x6f, 0x77, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e,
-	0x56, 0x69, 0x65, 0x77, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01,
+	0x53, 0x68, 0x6f, 0x77, 0x22, 0x3b, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x50, 0x72, 0x65, 0x53, 0x61,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x65, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75,
-	0x61, 0x63, 0x63, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x63, 0x63,
+	0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x49, 0x64,
-	0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x67, 0x6d, 0x74, 0x41, 0x63, 0x63, 0x49,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64,
+	0x64, 0x22, 0x9a, 0x07, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x65, 0x77, 0x12, 0x16,
-	0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
-	0x52, 0x06, 0x74, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x76, 0x69,
+	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x63, 0x63, 0x49, 0x64, 0x18,
-	0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x63, 0x63, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
-	0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f,
+	0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75,
+	0x09, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65,
-	0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x4e,
-	0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x52, 0x65,
+	0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65,
-	0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x73,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f,
-	0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x64, 0x64, 0x53,
+	0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20,
-	0x74, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x66, 0x64, 0x64, 0x53,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
-	0x74, 0x61, 0x74, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x18,
+	0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f,
-	0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x16, 0x0a,
+	0x74, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65,
-	0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x73, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61,
-	0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d,
+	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x64, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x09,
-	0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x66, 0x64, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x17,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
+	0x0a, 0x07, 0x69, 0x73, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x52, 0x05, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x0e,
+	0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65,
+	0x6b, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x12,
-	0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61,
+	0x1a, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
+	0x09, 0x52, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x42,
+	0x64, 0x4e, 0x75, 0x6d, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x64, 0x4e, 0x75,
-	0x61, 0x63, 0x6b, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64, 0x63, 0x61, 0x72,
+	0x6d, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x64, 0x42, 0x61, 0x63, 0x6b, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x5f,
+	0x73, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03,
-	0x66, 0x72, 0x6f, 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x64, 0x63,
+	0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x61, 0x72, 0x64, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x69, 0x6e, 0x76, 0x69,
+	0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
-	0x74, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x13, 0x20,
+	0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x18, 0x11, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x11, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x69,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x42, 0x61, 0x63, 0x6b, 0x12,
-	0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65,
+	0x21, 0x0a, 0x0c, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x5f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x18,
-	0x72, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x46, 0x72, 0x6f,
-	0x0f, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x72, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65,
+	0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x76,
-	0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x15, 0x20,
+	0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x69,
-	0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c,
+	0x6e, 0x76, 0x69, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65,
-	0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x16, 0x20, 0x01, 0x28,
+	0x12, 0x28, 0x0a, 0x0f, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x72, 0x52, 0x65, 0x61, 0x6c, 0x4e,
-	0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09,
+	0x61, 0x6d, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x6e, 0x76, 0x69, 0x74,
-	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x65, 0x72, 0x52, 0x65, 0x61, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x6a, 0x6f,
-	0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65,
+	0x69, 0x6e, 0x41, 0x73, 0x73, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09,
-	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x65, 0x6e,
+	0x52, 0x0c, 0x6a, 0x6f, 0x69, 0x6e, 0x41, 0x73, 0x73, 0x6f, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d,
+	0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28,
-	0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61,
+	0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09,
-	0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x65, 0x4e, 0x75, 0x6d, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x65, 0x72, 0x74,
+	0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70,
+	0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63,
-	0x65, 0x6e, 0x42, 0x61, 0x6e, 0x6b, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6f, 0x70,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x6e, 0x4e,
-	0x65, 0x6e, 0x42, 0x61, 0x6e, 0x6b, 0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x65, 0x6e, 0x4e, 0x61,
-	0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
+	0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e,
+	0x75, 0x6d, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x65, 0x72, 0x74,
+	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x67, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0e, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x49, 0x6d, 0x67,
+	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x6e, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x1b, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x6e, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x62, 0x61, 0x6e, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62,
+	0x61, 0x6e, 0x6b, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74,
+	0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
 	0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x79,
 	0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x73, 0x55, 0x73, 0x65, 0x72, 0x56,
 	0x69, 0x65, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x64,

pb/artistinfoArtshow.proto

@@ -18,6 +18,7 @@ service ArtistInfoArtshow {
   rpc DeletedArtshowVideo(DeletedArtshowVideoRequest)returns(google.protobuf.Empty){} //删除画展视频
 //  rpc CheckeExists(CheckeExistsRequest)returns(google.protobuf.Empty){} //删除画展视频
 //  rpc GetArtistListOfVideo(ArtistListRequest)returns(){}//获取后台画家指数审批的画家列表
+  rpc GetArtshowHistroyList(GetArtshowHistroyListRequest)returns(GetArtshowHistroyListResponse){}//获取画展补充信息的历史记录(按锁定时间端分组)
   
   //画家指数
   rpc GetArtistIndexDetail(GetArtistIndexDetailRequest)returns(ArtistIndexInfo){} //获取视频详情
@@ -238,3 +239,87 @@ message DeletedArtistSupplementRequest{
   int64 Id=1; //单个删除
   repeated  int64  Ids =2; //批量删除
 }
+
+message GetArtshowHistroyListRequest{
+  int64 page =1;
+  int64 pageSize=2;
+  int64 artistUid=3;
+  int64 auditStatus=4;
+}
+// 历史记录查询
+message artworkSupplementData{
+  string ArtistUid=1;
+  int64 Status=2;
+  string LockTime=3;
+  int64 AuditStatus=4;
+  string AuditMark1=5;
+  string AuditMark2=6;
+  string ArtistName=7;
+  string ArtistProfile=8;
+  int64 CountryArtLevel=9;
+  string ArtistCertPic=10;
+  string BankNum=11;
+  string BankName=12;
+  int64  id=13;
+  string createdAt=14;
+  string updatedAt=15;
+  int64 deletedAt=16;
+}
+message artistSupplementData{
+  string ArtistUid=1;
+  int64 Status=2;
+  string LockTime=3;
+  int64 AuditStatus=4;
+  string AuditMark1=5;
+  string AuditMark2=6;
+  string ArtistName=7;
+  string ArtistProfile=8;
+  int64 CountryArtLevel=9;
+  string ArtistCertPic=10;
+  string BankNum=11;
+  string BankName=12;
+  int64  id=13;
+  string createdAt=14;
+  string updatedAt=15;
+  string deletedAt=16;
+
+}
+message artistIndexData{
+  string artistUid=1;
+  string title=2;
+  string class=3;
+  int64 titleScore=4;
+  string score=5;
+  string types=6;
+  int64 status=7;
+  string lockTime=8;
+  string auditMark1=9;
+  string auditMark2=10;
+  int64 auditStatus=11;
+  int64  id=12;
+  string createdAt=13;
+  string updatedAt=14;
+  string deletedAt=15;
+
+}
+message artistVideoData{
+  int64  id =1;
+  string artistUid =2;
+  string lockTime =3;
+  string videoUrl =4;
+  int64  auditStatus =5;
+  string auditMark1 =6;
+  string auditMark2 =7;
+  string artistName =8;
+}
+message timeGroup {
+  string time =1;
+  repeated artworkSupplementData artworkSupplementList =2;
+  repeated artistSupplementData artistSupplementList =3;
+  repeated artistIndexData artistIndexList =4;
+  repeated artistVideoData artistVideoList =5;
+}
+message GetArtshowHistroyListResponse{
+   videoPagination page=1;
+   repeated  timeGroup Data =2;
+}

pb/artistinfoArtshow/artistinfoArtshow_triple.pb.go

@@ -37,6 +37,9 @@ type ArtistInfoArtshowClient interface {
 	AuditArtshowVideo(ctx context.Context, in *AuditArtshowVideoRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
 	UpdateArtshowVideo(ctx context.Context, in *UpdateArtshowVideoRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
 	DeletedArtshowVideo(ctx context.Context, in *DeletedArtshowVideoRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
+	// rpc CheckeExists(CheckeExistsRequest)returns(google.protobuf.Empty){} //删除画展视频
+	// rpc GetArtistListOfVideo(ArtistListRequest)returns(){}//获取后台画家指数审批的画家列表
+	GetArtshowHistroyList(ctx context.Context, in *GetArtshowHistroyListRequest, opts ...grpc_go.CallOption) (*GetArtshowHistroyListResponse, common.ErrorWithAttachment)
 	// 画家指数
 	GetArtistIndexDetail(ctx context.Context, in *GetArtistIndexDetailRequest, opts ...grpc_go.CallOption) (*ArtistIndexInfo, common.ErrorWithAttachment)
 	GetArtistIndexList(ctx context.Context, in *GetArtistIndexListRequest, opts ...grpc_go.CallOption) (*GetArtistIndexListResponse, common.ErrorWithAttachment)
@@ -67,6 +70,7 @@ type ArtistInfoArtshowClientImpl struct {
 	AuditArtshowVideo           func(ctx context.Context, in *AuditArtshowVideoRequest) (*emptypb.Empty, error)
 	UpdateArtshowVideo          func(ctx context.Context, in *UpdateArtshowVideoRequest) (*emptypb.Empty, error)
 	DeletedArtshowVideo         func(ctx context.Context, in *DeletedArtshowVideoRequest) (*emptypb.Empty, error)
+	GetArtshowHistroyList       func(ctx context.Context, in *GetArtshowHistroyListRequest) (*GetArtshowHistroyListResponse, error)
 	GetArtistIndexDetail        func(ctx context.Context, in *GetArtistIndexDetailRequest) (*ArtistIndexInfo, error)
 	GetArtistIndexList          func(ctx context.Context, in *GetArtistIndexListRequest) (*GetArtistIndexListResponse, error)
 	CreateArtistIndex           func(ctx context.Context, in *ArtistIndexInfo) (*emptypb.Empty, error)
@@ -137,6 +141,12 @@ func (c *artistInfoArtshowClient) DeletedArtshowVideo(ctx context.Context, in *D
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/DeletedArtshowVideo", in, out)
 }
 
+func (c *artistInfoArtshowClient) GetArtshowHistroyList(ctx context.Context, in *GetArtshowHistroyListRequest, opts ...grpc_go.CallOption) (*GetArtshowHistroyListResponse, common.ErrorWithAttachment) {
+	out := new(GetArtshowHistroyListResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetArtshowHistroyList", in, out)
+}
+
 func (c *artistInfoArtshowClient) GetArtistIndexDetail(ctx context.Context, in *GetArtistIndexDetailRequest, opts ...grpc_go.CallOption) (*ArtistIndexInfo, common.ErrorWithAttachment) {
 	out := new(ArtistIndexInfo)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -233,6 +243,9 @@ type ArtistInfoArtshowServer interface {
 	AuditArtshowVideo(context.Context, *AuditArtshowVideoRequest) (*emptypb.Empty, error)
 	UpdateArtshowVideo(context.Context, *UpdateArtshowVideoRequest) (*emptypb.Empty, error)
 	DeletedArtshowVideo(context.Context, *DeletedArtshowVideoRequest) (*emptypb.Empty, error)
+	// rpc CheckeExists(CheckeExistsRequest)returns(google.protobuf.Empty){} //删除画展视频
+	// rpc GetArtistListOfVideo(ArtistListRequest)returns(){}//获取后台画家指数审批的画家列表
+	GetArtshowHistroyList(context.Context, *GetArtshowHistroyListRequest) (*GetArtshowHistroyListResponse, error)
 	// 画家指数
 	GetArtistIndexDetail(context.Context, *GetArtistIndexDetailRequest) (*ArtistIndexInfo, error)
 	GetArtistIndexList(context.Context, *GetArtistIndexListRequest) (*GetArtistIndexListResponse, error)
@@ -278,6 +291,9 @@ func (UnimplementedArtistInfoArtshowServer) UpdateArtshowVideo(context.Context,
 func (UnimplementedArtistInfoArtshowServer) DeletedArtshowVideo(context.Context, *DeletedArtshowVideoRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletedArtshowVideo not implemented")
 }
+func (UnimplementedArtistInfoArtshowServer) GetArtshowHistroyList(context.Context, *GetArtshowHistroyListRequest) (*GetArtshowHistroyListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetArtshowHistroyList not implemented")
+}
 func (UnimplementedArtistInfoArtshowServer) GetArtistIndexDetail(context.Context, *GetArtistIndexDetailRequest) (*ArtistIndexInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetArtistIndexDetail not implemented")
 }
@@ -551,6 +567,35 @@ func _ArtistInfoArtshow_DeletedArtshowVideo_Handler(srv interface{}, ctx context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ArtistInfoArtshow_GetArtshowHistroyList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetArtshowHistroyListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetArtshowHistroyList", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ArtistInfoArtshow_GetArtistIndexDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetArtistIndexDetailRequest)
 	if err := dec(in); err != nil {
@@ -992,6 +1037,10 @@ var ArtistInfoArtshow_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "DeletedArtshowVideo",
 			Handler:    _ArtistInfoArtshow_DeletedArtshowVideo_Handler,
 		},
+		{
+			MethodName: "GetArtshowHistroyList",
+			Handler:    _ArtistInfoArtshow_GetArtshowHistroyList_Handler,
+		},
 		{
 			MethodName: "GetArtistIndexDetail",
 			Handler:    _ArtistInfoArtshow_GetArtistIndexDetail_Handler,

pb/artistinfoUser.proto

@@ -393,6 +393,7 @@ message FindUsersRequest{
   bool isArtist=9;         //查询有艺术家uid的数据
   repeated string mgmtArtistUids =10;
   bool isLock =11;
+  int64 mgmtAccountId = 12;
   //  string Account = 3;
   //  string TelNum = 4;
   //  bool   IsLock = 5;
@@ -447,6 +448,7 @@ message UserInfo{
   string inviteCode = 27;
   int64 mgmtArtistId = 28; //艺术家id
   string latestLockTime=29; //最近一次上锁时间
+  string joinAssoTime =32;
   //手机号更新用
   string domain =30;
   string verCode=31;
@@ -493,14 +495,17 @@ message UserView{
   string idcard_front=18;
   string inviterInviteCode=19;
   string inviterRealName=20;
+  string joinAssoTime=29;
   int64  deletedAt = 21;
-  int64  updatedAt = 22;
+  string  updatedAt = 22;
-  int64  createdAt = 23;
+  string  createdAt = 23;
   string penName =24;
   string stageName=25;
   string certificateNum=26;
-  string openBank=27;
+  string certificateImg=30;
-  string latestLockTime=28;
+  string bankName=27;
+  string bankNum=28;
+  string latestLockTime=31;
 }
 message FindUsersUserViewResponse{
   repeated UserView data=1;