feat: get userid

internal/logic/get_mk_ids_logic.go

@@ -0,0 +1,42 @@
+package logic
+
+import (
+	"context"
+	"fmt"
+
+	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
+	"git.i2edu.net/i2/i2-bill-erp/model"
+	"git.i2edu.net/i2/i2-bill-erp/transform"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type GetMkIdsLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetMkIdsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMkIdsLogic {
+	return &GetMkIdsLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetMkIdsLogic) GetMkIds(in *transform.CityMkReq) (*transform.CityMkRes, error) {
+	var users []model.SysUser
+	err := l.svcCtx.SqlConn.QueryRowsPartial(&users, fmt.Sprintf("select id, mobile from sys_user where mobile in (%v) and del_flag!=1", in.Phones))
+	if err != nil {
+		return nil, err
+	}
+	tc := transform.CityMkRes{}
+	for i := range users {
+		if tc.MapList == nil {
+			tc.MapList = map[string]string{}
+		}
+		tc.MapList[users[i].Mobile] = users[i].Id
+	}
+	return &tc, nil
+}

internal/server/transform_server.go

@@ -58,6 +58,11 @@ func (s *TransformServer) GetCityIds(ctx context.Context, in *transform.CityIdsR
 	return l.GetCityIds(in)
 }
 
+func (s *TransformServer) GetMkIds(ctx context.Context, in *transform.CityMkReq) (*transform.CityMkRes, error) {
+	l := logic.NewGetMkIdsLogic(ctx, s.svcCtx)
+	return l.GetMkIds(in)
+}
+
 func (s *TransformServer) PostExcelLog(ctx context.Context, in *transform.ExcelLogReq) (*transform.ExcelLogRes, error) {
 	l := logic.NewPostExcelLogLogic(ctx, s.svcCtx)
 	return l.PostExcelLog(in)

transform.proto

@@ -122,10 +122,18 @@ message CityIdsReq {
   string names = 1;
 }
 
+message CityMkReq {
+  string phones = 1;
+}
+
 message CityIdsRes {
   map<string, int64> mapList=1;
 }
 
+message CityMkRes {
+  map<string, string> mapList=1;
+}
+
 message BytesReq{
   bytes req = 1;
 }
@@ -235,6 +243,7 @@ service Transform {
   rpc LoadOptionset(OptionsetReq) returns(OptionsetRes);
   rpc GetSchoolIds(SchoolIdsReq) returns(SchoolIdsRes);
   rpc GetCityIds(CityIdsReq) returns(CityIdsRes);
+  rpc GetMkIds(CityMkReq) returns(CityMkRes);
   rpc PostExcelLog(ExcelLogReq) returns(ExcelLogRes);
   rpc GetErpOptionset(OptionCode) returns(Options);
   rpc GetStudent(StudentReq) returns(StudentRes);

transform/transform.pb.go

@@ -1130,6 +1130,45 @@ func (m *CityIdsReq) GetNames() string {
 	return ""
 }
 
+type CityMkReq struct {
+	Phones               string   `protobuf:"bytes,1,opt,name=phones,proto3" json:"phones,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CityMkReq) Reset()         { *m = CityMkReq{} }
+func (m *CityMkReq) String() string { return proto.CompactTextString(m) }
+func (*CityMkReq) ProtoMessage()    {}
+func (*CityMkReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cb4a498eeb2ba07d, []int{22}
+}
+
+func (m *CityMkReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CityMkReq.Unmarshal(m, b)
+}
+func (m *CityMkReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CityMkReq.Marshal(b, m, deterministic)
+}
+func (m *CityMkReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CityMkReq.Merge(m, src)
+}
+func (m *CityMkReq) XXX_Size() int {
+	return xxx_messageInfo_CityMkReq.Size(m)
+}
+func (m *CityMkReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_CityMkReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CityMkReq proto.InternalMessageInfo
+
+func (m *CityMkReq) GetPhones() string {
+	if m != nil {
+		return m.Phones
+	}
+	return ""
+}
+
 type CityIdsRes struct {
 	MapList              map[string]int64 `protobuf:"bytes,1,rep,name=mapList,proto3" json:"mapList,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
@@ -1141,7 +1180,7 @@ func (m *CityIdsRes) Reset()         { *m = CityIdsRes{} }
 func (m *CityIdsRes) String() string { return proto.CompactTextString(m) }
 func (*CityIdsRes) ProtoMessage()    {}
 func (*CityIdsRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{22}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{23}
 }
 
 func (m *CityIdsRes) XXX_Unmarshal(b []byte) error {
@@ -1169,6 +1208,45 @@ func (m *CityIdsRes) GetMapList() map[string]int64 {
 	return nil
 }
 
+type CityMkRes struct {
+	MapList              map[string]string `protobuf:"bytes,1,rep,name=mapList,proto3" json:"mapList,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *CityMkRes) Reset()         { *m = CityMkRes{} }
+func (m *CityMkRes) String() string { return proto.CompactTextString(m) }
+func (*CityMkRes) ProtoMessage()    {}
+func (*CityMkRes) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cb4a498eeb2ba07d, []int{24}
+}
+
+func (m *CityMkRes) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CityMkRes.Unmarshal(m, b)
+}
+func (m *CityMkRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CityMkRes.Marshal(b, m, deterministic)
+}
+func (m *CityMkRes) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CityMkRes.Merge(m, src)
+}
+func (m *CityMkRes) XXX_Size() int {
+	return xxx_messageInfo_CityMkRes.Size(m)
+}
+func (m *CityMkRes) XXX_DiscardUnknown() {
+	xxx_messageInfo_CityMkRes.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CityMkRes proto.InternalMessageInfo
+
+func (m *CityMkRes) GetMapList() map[string]string {
+	if m != nil {
+		return m.MapList
+	}
+	return nil
+}
+
 type BytesReq struct {
 	Req                  []byte   `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1180,7 +1258,7 @@ func (m *BytesReq) Reset()         { *m = BytesReq{} }
 func (m *BytesReq) String() string { return proto.CompactTextString(m) }
 func (*BytesReq) ProtoMessage()    {}
 func (*BytesReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{23}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{25}
 }
 
 func (m *BytesReq) XXX_Unmarshal(b []byte) error {
@@ -1219,7 +1297,7 @@ func (m *BytesResp) Reset()         { *m = BytesResp{} }
 func (m *BytesResp) String() string { return proto.CompactTextString(m) }
 func (*BytesResp) ProtoMessage()    {}
 func (*BytesResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{24}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{26}
 }
 
 func (m *BytesResp) XXX_Unmarshal(b []byte) error {
@@ -1260,7 +1338,7 @@ func (m *GetErpRoleRes) Reset()         { *m = GetErpRoleRes{} }
 func (m *GetErpRoleRes) String() string { return proto.CompactTextString(m) }
 func (*GetErpRoleRes) ProtoMessage()    {}
 func (*GetErpRoleRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{25}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{27}
 }
 
 func (m *GetErpRoleRes) XXX_Unmarshal(b []byte) error {
@@ -1314,7 +1392,7 @@ func (m *GetErpRoleReq) Reset()         { *m = GetErpRoleReq{} }
 func (m *GetErpRoleReq) String() string { return proto.CompactTextString(m) }
 func (*GetErpRoleReq) ProtoMessage()    {}
 func (*GetErpRoleReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{26}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{28}
 }
 
 func (m *GetErpRoleReq) XXX_Unmarshal(b []byte) error {
@@ -1360,7 +1438,7 @@ func (m *GetErpOrganSchPerByUserIdReq) Reset()         { *m = GetErpOrganSchPerB
 func (m *GetErpOrganSchPerByUserIdReq) String() string { return proto.CompactTextString(m) }
 func (*GetErpOrganSchPerByUserIdReq) ProtoMessage()    {}
 func (*GetErpOrganSchPerByUserIdReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{27}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{29}
 }
 
 func (m *GetErpOrganSchPerByUserIdReq) XXX_Unmarshal(b []byte) error {
@@ -1399,7 +1477,7 @@ func (m *GetErpOrganSchPerByUserIdRes) Reset()         { *m = GetErpOrganSchPerB
 func (m *GetErpOrganSchPerByUserIdRes) String() string { return proto.CompactTextString(m) }
 func (*GetErpOrganSchPerByUserIdRes) ProtoMessage()    {}
 func (*GetErpOrganSchPerByUserIdRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{28}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{30}
 }
 
 func (m *GetErpOrganSchPerByUserIdRes) XXX_Unmarshal(b []byte) error {
@@ -1440,7 +1518,7 @@ func (m *OrganSchool) Reset()         { *m = OrganSchool{} }
 func (m *OrganSchool) String() string { return proto.CompactTextString(m) }
 func (*OrganSchool) ProtoMessage()    {}
 func (*OrganSchool) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{29}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{31}
 }
 
 func (m *OrganSchool) XXX_Unmarshal(b []byte) error {
@@ -1493,7 +1571,7 @@ func (m *GetErpSchoolRes) Reset()         { *m = GetErpSchoolRes{} }
 func (m *GetErpSchoolRes) String() string { return proto.CompactTextString(m) }
 func (*GetErpSchoolRes) ProtoMessage()    {}
 func (*GetErpSchoolRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{30}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{32}
 }
 
 func (m *GetErpSchoolRes) XXX_Unmarshal(b []byte) error {
@@ -1532,7 +1610,7 @@ func (m *GetErpActiveReq) Reset()         { *m = GetErpActiveReq{} }
 func (m *GetErpActiveReq) String() string { return proto.CompactTextString(m) }
 func (*GetErpActiveReq) ProtoMessage()    {}
 func (*GetErpActiveReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{31}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{33}
 }
 
 func (m *GetErpActiveReq) XXX_Unmarshal(b []byte) error {
@@ -1571,7 +1649,7 @@ func (m *GetErpActiveRes) Reset()         { *m = GetErpActiveRes{} }
 func (m *GetErpActiveRes) String() string { return proto.CompactTextString(m) }
 func (*GetErpActiveRes) ProtoMessage()    {}
 func (*GetErpActiveRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{32}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{34}
 }
 
 func (m *GetErpActiveRes) XXX_Unmarshal(b []byte) error {
@@ -1611,7 +1689,7 @@ func (m *Active) Reset()         { *m = Active{} }
 func (m *Active) String() string { return proto.CompactTextString(m) }
 func (*Active) ProtoMessage()    {}
 func (*Active) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{33}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{35}
 }
 
 func (m *Active) XXX_Unmarshal(b []byte) error {
@@ -1658,7 +1736,7 @@ func (m *DataPermissionReq) Reset()         { *m = DataPermissionReq{} }
 func (m *DataPermissionReq) String() string { return proto.CompactTextString(m) }
 func (*DataPermissionReq) ProtoMessage()    {}
 func (*DataPermissionReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{34}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{36}
 }
 
 func (m *DataPermissionReq) XXX_Unmarshal(b []byte) error {
@@ -1704,7 +1782,7 @@ func (m *DataPermissionRes) Reset()         { *m = DataPermissionRes{} }
 func (m *DataPermissionRes) String() string { return proto.CompactTextString(m) }
 func (*DataPermissionRes) ProtoMessage()    {}
 func (*DataPermissionRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{35}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{37}
 }
 
 func (m *DataPermissionRes) XXX_Unmarshal(b []byte) error {
@@ -1764,7 +1842,7 @@ func (m *MktReq) Reset()         { *m = MktReq{} }
 func (m *MktReq) String() string { return proto.CompactTextString(m) }
 func (*MktReq) ProtoMessage()    {}
 func (*MktReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{36}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{38}
 }
 
 func (m *MktReq) XXX_Unmarshal(b []byte) error {
@@ -1950,7 +2028,7 @@ func (m *MktRes) Reset()         { *m = MktRes{} }
 func (m *MktRes) String() string { return proto.CompactTextString(m) }
 func (*MktRes) ProtoMessage()    {}
 func (*MktRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{37}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{39}
 }
 
 func (m *MktRes) XXX_Unmarshal(b []byte) error {
@@ -1989,7 +2067,7 @@ func (m *StudentReq) Reset()         { *m = StudentReq{} }
 func (m *StudentReq) String() string { return proto.CompactTextString(m) }
 func (*StudentReq) ProtoMessage()    {}
 func (*StudentReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{38}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{40}
 }
 
 func (m *StudentReq) XXX_Unmarshal(b []byte) error {
@@ -2030,7 +2108,7 @@ func (m *StudentRes) Reset()         { *m = StudentRes{} }
 func (m *StudentRes) String() string { return proto.CompactTextString(m) }
 func (*StudentRes) ProtoMessage()    {}
 func (*StudentRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cb4a498eeb2ba07d, []int{39}
+	return fileDescriptor_cb4a498eeb2ba07d, []int{41}
 }
 
 func (m *StudentRes) XXX_Unmarshal(b []byte) error {
@@ -2097,8 +2175,11 @@ func init() {
 	proto.RegisterType((*SchoolIdsRes)(nil), "transform.SchoolIdsRes")
 	proto.RegisterMapType((map[string]int64)(nil), "transform.SchoolIdsRes.MapListEntry")
 	proto.RegisterType((*CityIdsReq)(nil), "transform.CityIdsReq")
+	proto.RegisterType((*CityMkReq)(nil), "transform.CityMkReq")
 	proto.RegisterType((*CityIdsRes)(nil), "transform.CityIdsRes")
 	proto.RegisterMapType((map[string]int64)(nil), "transform.CityIdsRes.MapListEntry")
+	proto.RegisterType((*CityMkRes)(nil), "transform.CityMkRes")
+	proto.RegisterMapType((map[string]string)(nil), "transform.CityMkRes.MapListEntry")
 	proto.RegisterType((*BytesReq)(nil), "transform.BytesReq")
 	proto.RegisterType((*BytesResp)(nil), "transform.BytesResp")
 	proto.RegisterType((*GetErpRoleRes)(nil), "transform.GetErpRoleRes")
@@ -2122,112 +2203,115 @@ func init() {
 func init() { proto.RegisterFile("transform.proto", fileDescriptor_cb4a498eeb2ba07d) }
 
 var fileDescriptor_cb4a498eeb2ba07d = []byte{
-	// 1666 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1b, 0xb7,
-	0x12, 0x87, 0x24, 0xeb, 0xdf, 0x48, 0xb6, 0x63, 0xc6, 0x76, 0x36, 0xfb, 0xfc, 0xf2, 0xfc, 0x88,
-	0xbc, 0xf7, 0x9c, 0x77, 0xf0, 0x21, 0x29, 0xda, 0xc0, 0x08, 0xd2, 0xf8, 0x5f, 0x0c, 0x01, 0xfe,
-	0x57, 0xc9, 0x41, 0xd1, 0x4b, 0x8d, 0x8d, 0x96, 0x91, 0xb7, 0x5a, 0x2d, 0xe5, 0x25, 0x95, 0x46,
-	0x5f, 0xa0, 0x87, 0x5e, 0xdb, 0x6b, 0xfb, 0xa9, 0x7a, 0x29, 0xfa, 0x5d, 0x8a, 0x62, 0x48, 0xee,
-	0x2e, 0x25, 0xad, 0xec, 0xa4, 0x6d, 0x6e, 0x3b, 0x3f, 0xce, 0x0c, 0x67, 0x86, 0xc3, 0x99, 0xe1,
-	0xc2, 0xb2, 0x8c, 0xbd, 0x48, 0xbc, 0xe1, 0xf1, 0x60, 0x7b, 0x18, 0x73, 0xc9, 0x49, 0x3d, 0x05,
-	0xe8, 0x13, 0x68, 0xbc, 0x12, 0x2c, 0x6e, 0xb3, 0xeb, 0x11, 0x13, 0x92, 0x2c, 0x41, 0x31, 0xf0,
-	0x9d, 0xc2, 0x66, 0x61, 0xab, 0xde, 0x2e, 0x06, 0x3e, 0x59, 0x85, 0xf2, 0xf0, 0x8a, 0x47, 0xcc,
-	0x29, 0x2a, 0x48, 0x13, 0xf4, 0x97, 0x02, 0x34, 0xb5, 0x94, 0x18, 0xf2, 0x48, 0xb0, 0xf7, 0x13,
-	0x43, 0x34, 0xe6, 0x21, 0x13, 0x4e, 0x49, 0xa3, 0x8a, 0x20, 0xeb, 0x50, 0x11, 0xd2, 0x93, 0x23,
-	0xe1, 0x2c, 0x6c, 0x16, 0xb6, 0x4a, 0x6d, 0x43, 0x91, 0x4d, 0x68, 0xb0, 0x78, 0xd8, 0xe6, 0x21,
-	0xbb, 0x18, 0x0f, 0x99, 0x53, 0x56, 0x8b, 0x36, 0x44, 0x5c, 0xa8, 0x8d, 0x04, 0x8b, 0x4f, 0xbd,
-	0x01, 0x73, 0x2a, 0x4a, 0x65, 0x4a, 0xe3, 0x5a, 0x37, 0x90, 0x63, 0xb5, 0x56, 0xd5, 0x6b, 0x09,
-	0x8d, 0x3b, 0xf6, 0x58, 0xe4, 0xb3, 0xd8, 0xa9, 0xe9, 0x1d, 0x35, 0x45, 0x1f, 0x42, 0xf3, 0x82,
-	0xf7, 0x59, 0x94, 0x04, 0x63, 0x15, 0xca, 0x12, 0x69, 0xe3, 0x98, 0x26, 0xe8, 0x4f, 0x45, 0x58,
-	0x34, 0x6c, 0xc6, 0xfb, 0x75, 0xa8, 0x60, 0x34, 0x5a, 0x49, 0x04, 0x0c, 0x85, 0x1e, 0xa8, 0x28,
-	0xf1, 0x90, 0xb5, 0x7c, 0x61, 0x62, 0x61, 0x43, 0xe4, 0x21, 0x2c, 0x22, 0xd9, 0xe9, 0x5e, 0x71,
-	0x1e, 0x22, 0x8f, 0x8e, 0xcc, 0x24, 0x48, 0xb6, 0x60, 0x19, 0x81, 0xf3, 0x98, 0xbf, 0x0d, 0xa2,
-	0xae, 0xd2, 0xb5, 0xa0, 0xf8, 0xa6, 0x61, 0x42, 0xf5, 0xb9, 0x9c, 0xc5, 0x3d, 0x2f, 0x42, 0xb6,
-	0xb2, 0x62, 0x9b, 0xc0, 0xd0, 0xaa, 0xce, 0x58, 0x24, 0xda, 0x4d, 0xe0, 0x6c, 0x88, 0x3c, 0x00,
-	0xe8, 0x8c, 0x85, 0x11, 0x30, 0xd1, 0xb3, 0x10, 0xb2, 0x01, 0x75, 0xb5, 0xb1, 0x3a, 0xe1, 0x9a,
-	0x5a, 0xce, 0x00, 0x5a, 0x85, 0xf2, 0xe1, 0x60, 0x28, 0xc7, 0xf4, 0x53, 0xa8, 0x5f, 0xc4, 0x8c,
-	0x9d, 0x72, 0x9f, 0x09, 0xf2, 0x08, 0xca, 0x11, 0x7e, 0x38, 0x85, 0xcd, 0xd2, 0x56, 0xe3, 0xf1,
-	0xdd, 0xed, 0x2c, 0x27, 0x13, 0xa6, 0xb6, 0xe6, 0xa0, 0x3f, 0x14, 0xa0, 0x96, 0x60, 0x56, 0x66,
-	0x95, 0x54, 0x66, 0x11, 0x58, 0x90, 0xec, 0x9d, 0x34, 0xc1, 0x54, 0xdf, 0x18, 0xff, 0xa1, 0x17,
-	0xb3, 0x48, 0xaa, 0xf0, 0x95, 0xda, 0x86, 0x22, 0x9b, 0x50, 0x92, 0x5e, 0x4f, 0xc5, 0xaa, 0xf1,
-	0x78, 0xc9, 0xde, 0xd1, 0xeb, 0xb5, 0x71, 0x29, 0xb3, 0xaa, 0x7c, 0xab, 0x55, 0x3f, 0x17, 0xe0,
-	0xee, 0x61, 0x3c, 0x3c, 0xe9, 0xcb, 0x53, 0x26, 0xbf, 0xe4, 0x71, 0xff, 0x80, 0x49, 0x2f, 0x08,
-	0x3f, 0x40, 0xc5, 0x5f, 0xf4, 0xa5, 0x11, 0x44, 0x57, 0x2c, 0x0e, 0xa4, 0x17, 0x75, 0x99, 0x39,
-	0x7f, 0x1b, 0xa2, 0xa7, 0xb0, 0x9e, 0x63, 0x5f, 0x9b, 0x09, 0xf2, 0x09, 0x94, 0x03, 0xc9, 0x06,
-	0x89, 0x89, 0x0f, 0x2c, 0x13, 0xf3, 0x24, 0x34, 0x33, 0xfd, 0xff, 0x1c, 0x7d, 0xd7, 0xe4, 0x0e,
-	0x94, 0x02, 0x5f, 0x98, 0x64, 0xc7, 0x4f, 0xfa, 0x08, 0x4a, 0x17, 0x5e, 0x2f, 0xcf, 0xc1, 0x08,
-	0x2f, 0xa0, 0x71, 0x10, 0xbf, 0x29, 0x85, 0xe6, 0xd9, 0x50, 0x06, 0x78, 0x71, 0x24, 0x2a, 0x23,
-	0xb0, 0xd0, 0xe5, 0x3e, 0x33, 0xda, 0xd4, 0x37, 0xfd, 0xbe, 0x30, 0xc1, 0x24, 0xc8, 0x73, 0xa8,
-	0x0e, 0xbc, 0xe1, 0x71, 0x20, 0xa4, 0xc9, 0x9f, 0x87, 0x96, 0x0f, 0x36, 0xe7, 0xf6, 0x89, 0x66,
-	0x3b, 0x8c, 0x64, 0x3c, 0x6e, 0x27, 0x42, 0xee, 0x0e, 0x34, 0xed, 0x05, 0xf4, 0xa0, 0xcf, 0xc6,
-	0x89, 0x07, 0x7d, 0x36, 0xc6, 0xbb, 0xfe, 0xd6, 0x0b, 0x47, 0x69, 0xc5, 0x52, 0xc4, 0x4e, 0xf1,
-	0x69, 0x81, 0x6e, 0x02, 0xe8, 0x1d, 0xf6, 0x31, 0x1f, 0xf3, 0xcc, 0x3d, 0x82, 0xaa, 0xb1, 0x21,
-	0x6f, 0x39, 0x2f, 0x0a, 0xd9, 0x76, 0x25, 0x6b, 0x3b, 0x8c, 0x4d, 0x52, 0x54, 0xf6, 0xc6, 0x52,
-	0x49, 0xfa, 0x9e, 0xf4, 0x94, 0xb6, 0x66, 0x5b, 0x7d, 0xd3, 0xdf, 0x0a, 0xd0, 0x38, 0x7c, 0xd7,
-	0x65, 0xe1, 0x31, 0xef, 0x61, 0xfc, 0xd6, 0xa1, 0x72, 0xc2, 0xfd, 0x51, 0x98, 0xec, 0x69, 0x28,
-	0x94, 0xdd, 0xe7, 0x91, 0x9f, 0xec, 0x8a, 0xdf, 0x58, 0x14, 0xf7, 0x63, 0xe6, 0x49, 0xb6, 0x37,
-	0x36, 0x1b, 0xa7, 0x34, 0x5e, 0x7a, 0xfd, 0x7d, 0x11, 0x0c, 0x92, 0xfc, 0xb2, 0x10, 0x2c, 0x2d,
-	0xc7, 0x9e, 0x90, 0xaf, 0x86, 0xbe, 0x96, 0x37, 0xa5, 0xc5, 0xc6, 0xc8, 0x7f, 0x61, 0x29, 0xa3,
-	0x95, 0x1e, 0x5d, 0x5d, 0xa6, 0x50, 0xe2, 0x40, 0xf5, 0x80, 0x85, 0x2f, 0x43, 0xaf, 0x67, 0xaa,
-	0x4b, 0x42, 0xd2, 0xff, 0xd8, 0xce, 0xa9, 0xde, 0xd0, 0xd1, 0xbd, 0x41, 0x27, 0x95, 0xa1, 0xb0,
-	0x52, 0xa7, 0xe5, 0x11, 0x83, 0xb0, 0x0a, 0x65, 0x0c, 0xab, 0xae, 0x2e, 0xf5, 0xb6, 0x26, 0xe8,
-	0x3f, 0xa1, 0x8e, 0x47, 0x7e, 0xf6, 0xa6, 0x15, 0xc9, 0x2c, 0x69, 0x4b, 0x5b, 0x25, 0x9d, 0xb4,
-	0x98, 0x65, 0x96, 0x96, 0x5b, 0xb2, 0xcc, 0xe6, 0xfc, 0x7b, 0xb2, 0xac, 0x64, 0x67, 0x19, 0x05,
-	0xd8, 0x0f, 0xe4, 0x78, 0xd6, 0x9f, 0x42, 0xe6, 0xcf, 0x77, 0x05, 0x8b, 0x49, 0x90, 0x67, 0xd3,
-	0xe6, 0x52, 0xcb, 0xdc, 0x8c, 0xef, 0x23, 0x18, 0xbb, 0x01, 0x35, 0xcc, 0x4f, 0x61, 0x8a, 0x41,
-	0xcc, 0xae, 0x4d, 0x8a, 0xe2, 0x27, 0xfd, 0x17, 0xd4, 0xcd, 0xaa, 0x18, 0x62, 0x1a, 0xc6, 0x4c,
-	0x0c, 0x93, 0x14, 0xc6, 0x6f, 0xda, 0x81, 0xc5, 0x23, 0x26, 0x0f, 0x75, 0x27, 0x47, 0x4f, 0xee,
-	0x41, 0x15, 0x1b, 0xf7, 0x65, 0x3a, 0x43, 0x54, 0x46, 0xba, 0x83, 0xa2, 0x34, 0x0f, 0xd3, 0xab,
-	0x83, 0xdf, 0x64, 0x0d, 0x2a, 0xa2, 0x7b, 0x85, 0xbc, 0xba, 0x42, 0x96, 0x45, 0xf7, 0xaa, 0xe5,
-	0xd3, 0x17, 0x93, 0x4a, 0xd5, 0xc5, 0x18, 0xf0, 0xd7, 0x41, 0x76, 0x31, 0x34, 0x65, 0x6f, 0x56,
-	0xb4, 0x37, 0xa3, 0x9f, 0xc1, 0x86, 0xd6, 0xa0, 0xfa, 0x5c, 0xa7, 0x7b, 0x75, 0xce, 0xe2, 0xbd,
-	0xb1, 0xee, 0xe5, 0xa8, 0x70, 0x9e, 0x95, 0xf4, 0xf4, 0x46, 0x41, 0x41, 0xb6, 0x95, 0xc5, 0x9c,
-	0x87, 0xe6, 0x9c, 0xd6, 0xed, 0xe2, 0x65, 0x44, 0x38, 0x0f, 0xdb, 0x86, 0x8b, 0x1e, 0x43, 0xc3,
-	0x82, 0xdf, 0xa7, 0xaa, 0x92, 0xfb, 0x50, 0xe3, 0x28, 0x92, 0x85, 0xa5, 0xca, 0x75, 0xb7, 0xa6,
-	0xbb, 0xb0, 0xac, 0xad, 0x33, 0xbb, 0xfc, 0x09, 0x83, 0xb6, 0x12, 0x15, 0xbb, 0x5d, 0x19, 0xbc,
-	0x55, 0xd1, 0xcd, 0x4e, 0x01, 0x0d, 0x5b, 0x48, 0x4e, 0xe1, 0xd9, 0x34, 0x27, 0x76, 0xfe, 0x8a,
-	0xa7, 0x08, 0xb3, 0xd9, 0x8a, 0xb5, 0x99, 0xe1, 0x32, 0x0c, 0xf4, 0x39, 0x54, 0x34, 0x42, 0xfe,
-	0x01, 0x75, 0x8d, 0x5d, 0xa6, 0xae, 0xd7, 0x34, 0xd0, 0xf2, 0xf1, 0x20, 0x06, 0xde, 0xa5, 0x15,
-	0x83, 0xca, 0xc0, 0xc3, 0xc1, 0x8e, 0xb6, 0x60, 0xe5, 0xc0, 0x93, 0xde, 0x39, 0x8b, 0x07, 0x81,
-	0x10, 0x01, 0xc7, 0x49, 0x0e, 0x55, 0xc5, 0xa3, 0x90, 0x5d, 0x5a, 0x75, 0xb9, 0x86, 0x80, 0x2a,
-	0xe7, 0x73, 0x93, 0xe1, 0xc7, 0xc2, 0xac, 0x2e, 0x41, 0xf6, 0xa7, 0xaf, 0xdc, 0x23, 0xcb, 0x99,
-	0x19, 0xf6, 0x8f, 0xd0, 0x8c, 0x7e, 0x5f, 0x80, 0xca, 0x49, 0x5f, 0x35, 0xce, 0x25, 0x28, 0xb6,
-	0xd2, 0xb4, 0xd0, 0x77, 0xe5, 0xa4, 0xdf, 0x4a, 0x0b, 0x3e, 0x7e, 0x63, 0x41, 0x3e, 0xf7, 0x62,
-	0x89, 0x45, 0xd7, 0x4c, 0xa8, 0x3a, 0x39, 0xa6, 0x50, 0x6b, 0x82, 0x35, 0x33, 0xb8, 0xc1, 0x1d,
-	0xa8, 0x76, 0xe4, 0x48, 0x0d, 0xd1, 0xba, 0xde, 0x27, 0x24, 0xb6, 0x92, 0xdd, 0x1e, 0x3b, 0x8a,
-	0xf9, 0x68, 0xa8, 0x8a, 0x7c, 0xa9, 0x9d, 0xd2, 0x38, 0xd5, 0x76, 0xe4, 0xe8, 0x38, 0x88, 0xfa,
-	0xe7, 0x2c, 0x16, 0x3c, 0x52, 0x45, 0xbe, 0xd4, 0x9e, 0x04, 0x51, 0x43, 0x47, 0x8e, 0xec, 0x21,
-	0x32, 0xa5, 0x31, 0x00, 0x1d, 0xcc, 0x27, 0xa7, 0xae, 0xaf, 0xb8, 0x22, 0xd0, 0x9a, 0x5d, 0xdf,
-	0x8f, 0x99, 0x10, 0x0e, 0x68, 0x6b, 0x0c, 0x39, 0xd5, 0xbc, 0x1a, 0x33, 0xcd, 0xcb, 0x6a, 0x38,
-	0x4d, 0x7d, 0x3b, 0x0c, 0xa9, 0x24, 0xaf, 0x58, 0xb7, 0x8f, 0x8d, 0x85, 0x39, 0x8b, 0x6a, 0xd1,
-	0x42, 0x70, 0xd6, 0x55, 0x94, 0x52, 0xbc, 0xa4, 0x67, 0xdd, 0x14, 0x40, 0xbd, 0x8a, 0xd8, 0x1b,
-	0x3b, 0xcb, 0xda, 0x22, 0x43, 0xe2, 0xcc, 0x7e, 0xca, 0xe4, 0xb7, 0xe9, 0xdc, 0xd4, 0xf2, 0x9d,
-	0x3b, 0x4a, 0xf9, 0x34, 0xac, 0x22, 0x69, 0x32, 0xdb, 0x59, 0x31, 0x91, 0x4c, 0x32, 0x1d, 0x1b,
-	0xb6, 0x17, 0x86, 0xea, 0x01, 0x44, 0xf4, 0x5a, 0x42, 0xab, 0xc6, 0xef, 0xa9, 0x95, 0xbb, 0xfa,
-	0xcc, 0x34, 0x85, 0x36, 0x7d, 0x31, 0xf2, 0xf8, 0x57, 0xdf, 0x04, 0xce, 0xaa, 0xf6, 0xd5, 0x90,
-	0x78, 0x2e, 0x27, 0x7d, 0xa9, 0x94, 0xab, 0xee, 0xe0, 0xac, 0xe9, 0x73, 0x99, 0x00, 0xd1, 0xe3,
-	0x63, 0xee, 0xf9, 0x3a, 0xfe, 0xeb, 0x8a, 0x23, 0x03, 0xe8, 0xa6, 0xc9, 0xbf, 0xf9, 0xbd, 0x79,
-	0x03, 0xa0, 0x23, 0x47, 0x3e, 0x8b, 0xf2, 0xb2, 0x94, 0x5e, 0x58, 0xab, 0x62, 0x26, 0x87, 0xed,
-	0x9c, 0x28, 0x4e, 0xe5, 0xc4, 0x0d, 0xc3, 0xcb, 0xe3, 0x5f, 0xeb, 0xf8, 0xd6, 0x30, 0x17, 0x91,
-	0xec, 0x40, 0xf5, 0x88, 0x49, 0x4c, 0x61, 0x62, 0x57, 0x36, 0xeb, 0x9d, 0xeb, 0xde, 0x9b, 0xc1,
-	0xcd, 0x5b, 0xee, 0x73, 0x80, 0x73, 0x2f, 0x16, 0x4c, 0xbd, 0xf0, 0x88, 0xcd, 0x66, 0x3f, 0x0d,
-	0x5d, 0x67, 0x76, 0xc1, 0x28, 0x78, 0x0a, 0x4b, 0xba, 0x02, 0x62, 0x07, 0xc6, 0x17, 0x00, 0xb9,
-	0x63, 0xcf, 0xdb, 0xf8, 0x32, 0x72, 0x57, 0x73, 0x1e, 0x09, 0xaa, 0x2a, 0xef, 0xfa, 0xfe, 0x49,
-	0x5f, 0x12, 0xbb, 0x44, 0xea, 0xdb, 0xee, 0xce, 0x40, 0x82, 0xec, 0xc2, 0x22, 0x9e, 0x4b, 0x3a,
-	0xfe, 0x4e, 0x58, 0x6b, 0xcf, 0xd8, 0xee, 0x9c, 0x05, 0x41, 0x5e, 0x40, 0xf3, 0x88, 0xc9, 0xec,
-	0xa5, 0x79, 0x2f, 0x7f, 0xe0, 0x99, 0xd4, 0x30, 0x31, 0x33, 0xed, 0x00, 0x1c, 0x31, 0x69, 0xa6,
-	0x0d, 0xb2, 0x96, 0x37, 0x81, 0x5c, 0xbb, 0xb9, 0x30, 0xce, 0x5b, 0xcd, 0x73, 0x2e, 0x64, 0x32,
-	0xf0, 0x4d, 0x1c, 0x96, 0x35, 0xe2, 0xba, 0xf9, 0x38, 0x0e, 0x40, 0xa6, 0xd9, 0x64, 0x21, 0x58,
-	0x9b, 0xf1, 0x14, 0xcb, 0xbc, 0x4b, 0x66, 0x03, 0x60, 0x2c, 0x37, 0xc9, 0x38, 0x21, 0x98, 0xa5,
-	0xaf, 0x9b, 0x0b, 0x0b, 0x72, 0x06, 0x2b, 0x47, 0x4c, 0x4e, 0x16, 0x7c, 0xb2, 0x71, 0x43, 0x2f,
-	0xb8, 0x76, 0x6f, 0x5a, 0x15, 0xe4, 0x00, 0x5c, 0xed, 0xca, 0xf4, 0x7b, 0xeb, 0x83, 0x32, 0xe8,
-	0x6b, 0x58, 0xcf, 0xd7, 0x42, 0xfe, 0x7d, 0xcb, 0x9b, 0x8f, 0x5d, 0xbb, 0xb7, 0xb2, 0x08, 0x32,
-	0x80, 0xfb, 0x73, 0x07, 0x1d, 0xf2, 0x3f, 0x4b, 0xfe, 0xa6, 0x39, 0xca, 0x7d, 0x4f, 0x46, 0xcc,
-	0x4e, 0xc8, 0x46, 0x3a, 0xe2, 0xcc, 0x88, 0x99, 0x49, 0xcf, 0x9d, 0xb7, 0x82, 0x19, 0xd2, 0xb4,
-	0x67, 0x9f, 0x9c, 0x40, 0xba, 0x33, 0xb2, 0xd9, 0x98, 0xf4, 0x32, 0x91, 0x36, 0x43, 0xc9, 0x2c,
-	0x6f, 0x3a, 0x0f, 0xb9, 0xf3, 0xd7, 0xd0, 0x0a, 0x32, 0xe9, 0xe7, 0x87, 0x1c, 0xea, 0xeb, 0x8a,
-	0xfa, 0x67, 0xf7, 0xe4, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x74, 0x65, 0xb9, 0xc6, 0x13,
-	0x00, 0x00,
+	// 1715 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x73, 0x1b, 0x3f,
+	0x11, 0x1f, 0xdb, 0xf1, 0xaf, 0xb5, 0x93, 0x34, 0x6a, 0x92, 0xde, 0xf7, 0x08, 0x25, 0x15, 0x05,
+	0x52, 0x1e, 0xf2, 0xd0, 0x32, 0xa5, 0x13, 0x3a, 0xa5, 0xf9, 0x55, 0x8f, 0x67, 0xe2, 0x24, 0xd8,
+	0xe9, 0x30, 0xbc, 0x90, 0xb9, 0xfa, 0x54, 0xe7, 0xf0, 0xf9, 0xe4, 0x9c, 0xe4, 0x52, 0xbf, 0x33,
+	0x3c, 0xf0, 0xc6, 0xc0, 0x2b, 0xfc, 0x55, 0xbc, 0xf1, 0xbf, 0x30, 0xcc, 0x4a, 0xba, 0x3b, 0xd9,
+	0x3e, 0x27, 0x2d, 0x7c, 0xfb, 0x76, 0xfb, 0xd1, 0x6a, 0xb5, 0xbb, 0x5a, 0x69, 0x3f, 0x3a, 0x58,
+	0x97, 0xb1, 0x17, 0x89, 0x8f, 0x3c, 0x1e, 0xed, 0x8f, 0x63, 0x2e, 0x39, 0xa9, 0xa7, 0x00, 0x7d,
+	0x01, 0x8d, 0xf7, 0x82, 0xc5, 0x5d, 0x76, 0x3b, 0x61, 0x42, 0x92, 0x35, 0x28, 0x06, 0xbe, 0x53,
+	0xd8, 0x2d, 0xec, 0xd5, 0xbb, 0xc5, 0xc0, 0x27, 0x9b, 0x50, 0x1e, 0xdf, 0xf0, 0x88, 0x39, 0x45,
+	0x05, 0x69, 0x81, 0xfe, 0xab, 0x00, 0x4d, 0x3d, 0x4b, 0x8c, 0x79, 0x24, 0xd8, 0x97, 0x4d, 0x43,
+	0x34, 0xe6, 0x21, 0x13, 0x4e, 0x49, 0xa3, 0x4a, 0x20, 0xdb, 0x50, 0x11, 0xd2, 0x93, 0x13, 0xe1,
+	0xac, 0xec, 0x16, 0xf6, 0x4a, 0x5d, 0x23, 0x91, 0x5d, 0x68, 0xb0, 0x78, 0xdc, 0xe5, 0x21, 0xbb,
+	0x9a, 0x8e, 0x99, 0x53, 0x56, 0x83, 0x36, 0x44, 0x5c, 0xa8, 0x4d, 0x04, 0x8b, 0xcf, 0xbd, 0x11,
+	0x73, 0x2a, 0xca, 0x64, 0x2a, 0xe3, 0x58, 0x3f, 0x90, 0x53, 0x35, 0x56, 0xd5, 0x63, 0x89, 0x8c,
+	0x2b, 0x0e, 0x58, 0xe4, 0xb3, 0xd8, 0xa9, 0xe9, 0x15, 0xb5, 0x44, 0x9f, 0x42, 0xf3, 0x8a, 0x0f,
+	0x59, 0x94, 0x24, 0x63, 0x13, 0xca, 0x12, 0x65, 0x13, 0x98, 0x16, 0xe8, 0x3f, 0x8a, 0xb0, 0x6a,
+	0xd4, 0x4c, 0xf4, 0xdb, 0x50, 0xc1, 0x6c, 0xb4, 0x93, 0x0c, 0x18, 0x09, 0x23, 0x50, 0x59, 0xe2,
+	0x21, 0x6b, 0xfb, 0xc2, 0xe4, 0xc2, 0x86, 0xc8, 0x53, 0x58, 0x45, 0xb1, 0xd7, 0xbf, 0xe1, 0x3c,
+	0x44, 0x1d, 0x9d, 0x99, 0x59, 0x90, 0xec, 0xc1, 0x3a, 0x02, 0x97, 0x31, 0xff, 0x14, 0x44, 0x7d,
+	0x65, 0x6b, 0x45, 0xe9, 0xcd, 0xc3, 0x84, 0xea, 0x7d, 0xb9, 0x88, 0x07, 0x5e, 0x84, 0x6a, 0x65,
+	0xa5, 0x36, 0x83, 0xa1, 0x57, 0xbd, 0xa9, 0x48, 0xac, 0x9b, 0xc4, 0xd9, 0x10, 0x79, 0x0c, 0xd0,
+	0x9b, 0x0a, 0x33, 0xc1, 0x64, 0xcf, 0x42, 0xc8, 0x0e, 0xd4, 0xd5, 0xc2, 0x6a, 0x87, 0x6b, 0x6a,
+	0x38, 0x03, 0x68, 0x15, 0xca, 0xa7, 0xa3, 0xb1, 0x9c, 0xd2, 0x97, 0x50, 0xbf, 0x8a, 0x19, 0x3b,
+	0xe7, 0x3e, 0x13, 0xe4, 0x19, 0x94, 0x23, 0xfc, 0x70, 0x0a, 0xbb, 0xa5, 0xbd, 0xc6, 0xf3, 0x87,
+	0xfb, 0x59, 0x4d, 0x26, 0x4a, 0x5d, 0xad, 0x41, 0xff, 0x56, 0x80, 0x5a, 0x82, 0x59, 0x95, 0x55,
+	0x52, 0x95, 0x45, 0x60, 0x45, 0xb2, 0xcf, 0xd2, 0x24, 0x53, 0x7d, 0x63, 0xfe, 0xc7, 0x5e, 0xcc,
+	0x22, 0xa9, 0xd2, 0x57, 0xea, 0x1a, 0x89, 0xec, 0x42, 0x49, 0x7a, 0x03, 0x95, 0xab, 0xc6, 0xf3,
+	0x35, 0x7b, 0x45, 0x6f, 0xd0, 0xc5, 0xa1, 0xcc, 0xab, 0xf2, 0xbd, 0x5e, 0xfd, 0xb3, 0x00, 0x0f,
+	0x4f, 0xe3, 0x71, 0x67, 0x28, 0xcf, 0x99, 0xfc, 0x2d, 0x8f, 0x87, 0x27, 0x4c, 0x7a, 0x41, 0xf8,
+	0x15, 0x26, 0xfe, 0xcf, 0x58, 0x1a, 0x41, 0x74, 0xc3, 0xe2, 0x40, 0x7a, 0x51, 0x9f, 0x99, 0xfd,
+	0xb7, 0x21, 0x7a, 0x0e, 0xdb, 0x39, 0xfe, 0x75, 0x99, 0x20, 0xbf, 0x80, 0x72, 0x20, 0xd9, 0x28,
+	0x71, 0xf1, 0xb1, 0xe5, 0x62, 0xde, 0x0c, 0xad, 0x4c, 0x7f, 0xbe, 0xc4, 0xde, 0x2d, 0x79, 0x00,
+	0xa5, 0xc0, 0x17, 0xa6, 0xd8, 0xf1, 0x93, 0x3e, 0x83, 0xd2, 0x95, 0x37, 0xc8, 0x0b, 0x30, 0xc2,
+	0x03, 0x68, 0x02, 0xc4, 0x6f, 0x4a, 0xa1, 0x79, 0x31, 0x96, 0x01, 0x1e, 0x1c, 0x89, 0xc6, 0x08,
+	0xac, 0xf4, 0xb9, 0xcf, 0x8c, 0x35, 0xf5, 0x4d, 0xff, 0x52, 0x98, 0x51, 0x12, 0xe4, 0x0d, 0x54,
+	0x47, 0xde, 0xf8, 0x2c, 0x10, 0xd2, 0xd4, 0xcf, 0x53, 0x2b, 0x06, 0x5b, 0x73, 0xbf, 0xa3, 0xd5,
+	0x4e, 0x23, 0x19, 0x4f, 0xbb, 0xc9, 0x24, 0xf7, 0x00, 0x9a, 0xf6, 0x00, 0x46, 0x30, 0x64, 0xd3,
+	0x24, 0x82, 0x21, 0x9b, 0xe2, 0x59, 0xff, 0xe4, 0x85, 0x93, 0xf4, 0xc6, 0x52, 0xc2, 0x41, 0xf1,
+	0x55, 0x81, 0xee, 0x02, 0xe8, 0x15, 0x8e, 0xb1, 0x1e, 0xf3, 0xdc, 0x6d, 0x41, 0xd5, 0xf8, 0x90,
+	0x37, 0x9c, 0x97, 0x85, 0x6c, 0xb9, 0x92, 0xb5, 0x1c, 0xe6, 0x26, 0xb9, 0x54, 0x8e, 0xa6, 0x52,
+	0xcd, 0xf4, 0x3d, 0xe9, 0x29, 0x6b, 0xcd, 0xae, 0xfa, 0xa6, 0xff, 0x2e, 0x40, 0xe3, 0xf4, 0x73,
+	0x9f, 0x85, 0x67, 0x7c, 0x80, 0xf9, 0xdb, 0x86, 0x4a, 0x87, 0xfb, 0x93, 0x30, 0x59, 0xd3, 0x48,
+	0x38, 0xf7, 0x98, 0x47, 0x7e, 0xb2, 0x2a, 0x7e, 0xe3, 0xa5, 0x78, 0x1c, 0x33, 0x4f, 0xb2, 0xa3,
+	0xa9, 0x59, 0x38, 0x95, 0xf1, 0xd0, 0xeb, 0xef, 0xab, 0x60, 0x94, 0xd4, 0x97, 0x85, 0xe0, 0xd5,
+	0x72, 0xe6, 0x09, 0xf9, 0x7e, 0xec, 0xeb, 0xf9, 0xe6, 0x6a, 0xb1, 0x31, 0xf2, 0x53, 0x58, 0xcb,
+	0x64, 0x65, 0x47, 0xdf, 0x2e, 0x73, 0x28, 0x71, 0xa0, 0x7a, 0xc2, 0xc2, 0x77, 0xa1, 0x37, 0x30,
+	0xb7, 0x4b, 0x22, 0xd2, 0x9f, 0xd8, 0xc1, 0xa9, 0xde, 0xd0, 0xd3, 0xbd, 0x41, 0x17, 0x95, 0x91,
+	0xf0, 0xa6, 0x4e, 0xaf, 0x47, 0x4c, 0xc2, 0x26, 0x94, 0x31, 0xad, 0xfa, 0x76, 0xa9, 0x77, 0xb5,
+	0x40, 0x7f, 0x08, 0x75, 0xdc, 0xf2, 0x8b, 0x8f, 0xed, 0x48, 0x66, 0x45, 0x5b, 0xda, 0x2b, 0xe9,
+	0xa2, 0xc5, 0x2a, 0xb3, 0xac, 0xdc, 0x53, 0x65, 0xb6, 0xe6, 0xf7, 0x53, 0x65, 0x25, 0xbb, 0xca,
+	0x28, 0xc0, 0x71, 0x20, 0xa7, 0x8b, 0xf1, 0x14, 0xb2, 0x78, 0x7e, 0x0c, 0x75, 0xd4, 0xe9, 0x0c,
+	0xcd, 0xbe, 0xab, 0xae, 0x9a, 0xe8, 0x18, 0x89, 0xfe, 0xb9, 0x60, 0x59, 0x12, 0xe4, 0xf5, 0x7c,
+	0x4c, 0xd4, 0x8a, 0x29, 0xd3, 0xfb, 0x06, 0x11, 0xfd, 0xa9, 0x90, 0xb9, 0x2b, 0xc8, 0xaf, 0xe6,
+	0xfd, 0x78, 0x32, 0xe7, 0x87, 0x52, 0xfb, 0x06, 0xc7, 0x77, 0x07, 0x6a, 0x78, 0x96, 0x84, 0xb9,
+	0xb8, 0x62, 0x76, 0x6b, 0x8e, 0x13, 0x7e, 0xd2, 0x1f, 0x41, 0xdd, 0x8c, 0x8a, 0x31, 0x1e, 0x99,
+	0x98, 0x89, 0x71, 0x72, 0xdc, 0xf0, 0x9b, 0xf6, 0x60, 0xb5, 0xc5, 0xe4, 0xa9, 0x66, 0x1d, 0x18,
+	0xc8, 0x23, 0xa8, 0x22, 0xc9, 0xb8, 0x4e, 0xf9, 0x4e, 0x65, 0xa2, 0xbb, 0x3d, 0xce, 0xe6, 0x61,
+	0x7a, 0xcc, 0xf1, 0x9b, 0x6c, 0x41, 0x45, 0xf4, 0x6f, 0x50, 0x57, 0xdf, 0xe6, 0x65, 0xd1, 0xbf,
+	0x69, 0xfb, 0xf4, 0xed, 0xac, 0x51, 0xb5, 0x99, 0x23, 0xfe, 0x21, 0xc8, 0x0e, 0xb1, 0x96, 0xec,
+	0xc5, 0x8a, 0xf6, 0x62, 0xf4, 0x97, 0xb0, 0xa3, 0x2d, 0xa8, 0x9e, 0xdc, 0xeb, 0xdf, 0x5c, 0xb2,
+	0xf8, 0x68, 0xaa, 0x79, 0x07, 0x1a, 0x5c, 0xe6, 0x25, 0x3d, 0xbf, 0x73, 0xa2, 0x20, 0xfb, 0xca,
+	0x63, 0xce, 0x43, 0xb3, 0x4d, 0xdb, 0xf6, 0x45, 0x6b, 0xa6, 0x70, 0x1e, 0x76, 0x8d, 0x16, 0x3d,
+	0x83, 0x86, 0x05, 0x7f, 0x49, 0x07, 0x20, 0xdf, 0x41, 0x8d, 0xe3, 0x94, 0x2c, 0x2d, 0x55, 0xae,
+	0x99, 0x05, 0x3d, 0x84, 0x75, 0xed, 0x9d, 0x59, 0xe5, 0x7f, 0x70, 0x68, 0x2f, 0x31, 0x71, 0xd8,
+	0x97, 0xc1, 0x27, 0x95, 0xdd, 0x6c, 0x17, 0xd0, 0xb1, 0x95, 0x64, 0x17, 0x5e, 0xcf, 0x6b, 0x22,
+	0x4b, 0xa9, 0x78, 0x4a, 0x30, 0x8b, 0x6d, 0x58, 0x8b, 0x19, 0x2d, 0xa3, 0x40, 0xdf, 0x40, 0x45,
+	0x23, 0xe4, 0x07, 0x50, 0xd7, 0xd8, 0x75, 0x1a, 0x7a, 0x4d, 0x03, 0x6d, 0x1f, 0x37, 0x62, 0xe4,
+	0x5d, 0x5b, 0x39, 0xa8, 0x8c, 0x3c, 0x24, 0xa1, 0xb4, 0x0d, 0x1b, 0x27, 0x9e, 0xf4, 0x2e, 0x59,
+	0x3c, 0x0a, 0x84, 0x08, 0x38, 0xb2, 0x4e, 0x34, 0x15, 0x4f, 0x42, 0x76, 0x6d, 0xf5, 0x90, 0x1a,
+	0x02, 0xaa, 0xf5, 0x2c, 0x2d, 0x86, 0xbf, 0x17, 0x16, 0x6d, 0x09, 0x72, 0x3c, 0x7f, 0xe2, 0x9e,
+	0x59, 0xc1, 0x2c, 0xa8, 0x7f, 0x83, 0x93, 0xf7, 0x9f, 0x15, 0xa8, 0x74, 0x86, 0xaa, 0xc9, 0xaf,
+	0x41, 0xb1, 0x9d, 0x96, 0x85, 0x3e, 0x2b, 0x9d, 0x61, 0x3b, 0x6d, 0x4e, 0xf8, 0x8d, 0xcd, 0xe3,
+	0xd2, 0x8b, 0x25, 0x36, 0x08, 0xc3, 0xa6, 0x75, 0x71, 0xcc, 0xa1, 0x16, 0xdb, 0x36, 0xef, 0x05,
+	0x83, 0x3b, 0x50, 0xed, 0xc9, 0x89, 0x22, 0xfc, 0xba, 0x37, 0x25, 0x22, 0xb6, 0xbd, 0xc3, 0x01,
+	0x6b, 0xc5, 0x7c, 0x32, 0x56, 0x0d, 0xa9, 0xd4, 0x4d, 0x65, 0x64, 0xe0, 0x3d, 0x39, 0x39, 0x0b,
+	0xa2, 0xe1, 0x25, 0x8b, 0x05, 0x8f, 0x54, 0x43, 0x2a, 0x75, 0x67, 0x41, 0xb4, 0xd0, 0x93, 0x13,
+	0x9b, 0xf0, 0xa6, 0x32, 0x26, 0xa0, 0x87, 0xf5, 0xe4, 0xd4, 0xf5, 0x11, 0x57, 0x02, 0x7a, 0x73,
+	0xe8, 0xfb, 0x31, 0x13, 0xc2, 0x01, 0xed, 0x8d, 0x11, 0xe7, 0x1a, 0x6d, 0x63, 0xa1, 0xd1, 0x5a,
+	0xcd, 0xb1, 0xa9, 0x4f, 0x87, 0x11, 0xd5, 0xcc, 0x1b, 0xd6, 0x1f, 0x62, 0x13, 0x64, 0xce, 0xaa,
+	0x1a, 0xb4, 0x10, 0xe4, 0xe5, 0x4a, 0x52, 0x86, 0xd7, 0x34, 0x2f, 0x4f, 0x01, 0xb4, 0xab, 0x84,
+	0xa3, 0xa9, 0xb3, 0xae, 0x3d, 0x32, 0x22, 0xbe, 0x2f, 0xce, 0x99, 0xfc, 0x63, 0xca, 0xf1, 0xda,
+	0xbe, 0xf3, 0x40, 0x19, 0x9f, 0x87, 0x55, 0x26, 0x4d, 0x65, 0x3b, 0x1b, 0x26, 0x93, 0x49, 0xa5,
+	0x23, 0xb9, 0xf0, 0xc2, 0x50, 0x3d, 0xd6, 0x88, 0x1e, 0x4b, 0x64, 0x45, 0x52, 0x3c, 0x35, 0xf2,
+	0x50, 0xef, 0x99, 0x96, 0xd0, 0xa7, 0xdf, 0x4c, 0x3c, 0xfe, 0xbb, 0x3f, 0x04, 0xce, 0xa6, 0x8e,
+	0xd5, 0x88, 0xb8, 0x2f, 0x9d, 0xa1, 0x54, 0xc6, 0x55, 0x93, 0x72, 0xb6, 0xf4, 0xbe, 0xcc, 0x80,
+	0x18, 0xf1, 0x19, 0xf7, 0x7c, 0x9d, 0xff, 0x6d, 0xa5, 0x91, 0x01, 0x74, 0xd7, 0xd4, 0xdf, 0x72,
+	0x1e, 0xb1, 0x03, 0xd0, 0x93, 0x13, 0x9f, 0x45, 0x79, 0x55, 0x4a, 0xaf, 0xac, 0x51, 0xb1, 0x50,
+	0xc3, 0x76, 0x4d, 0x14, 0xe7, 0x6a, 0xe2, 0x0e, 0xa2, 0xf5, 0xfc, 0xaf, 0x80, 0xef, 0x22, 0x73,
+	0x10, 0xc9, 0x01, 0x54, 0x5b, 0x4c, 0x62, 0x09, 0x13, 0xfb, 0x66, 0xb3, 0xde, 0xe4, 0xee, 0xa3,
+	0x05, 0xdc, 0xbc, 0x3b, 0x7f, 0x0d, 0x70, 0xe9, 0xc5, 0x82, 0xa9, 0xd7, 0x28, 0xb1, 0xd5, 0xec,
+	0x67, 0xac, 0xeb, 0x2c, 0x0e, 0x18, 0x03, 0xaf, 0x60, 0x4d, 0xdf, 0x80, 0xd8, 0x80, 0xf1, 0xb5,
+	0x42, 0x1e, 0xd8, 0x6f, 0x03, 0x7c, 0xc5, 0xb9, 0x9b, 0x39, 0x0f, 0x1a, 0x75, 0x2b, 0x1f, 0xfa,
+	0x7e, 0x67, 0x28, 0x89, 0x7d, 0x45, 0xea, 0xd3, 0xee, 0x2e, 0x40, 0x82, 0x1c, 0xc2, 0x2a, 0xee,
+	0x4b, 0x4a, 0xd5, 0x67, 0xbc, 0xb5, 0xdf, 0x03, 0xee, 0x92, 0x01, 0x41, 0xde, 0x42, 0xb3, 0xc5,
+	0x64, 0xf6, 0x2a, 0x7e, 0x94, 0x4f, 0xce, 0x66, 0x2d, 0xcc, 0xf0, 0xbb, 0x03, 0x80, 0x16, 0x93,
+	0x86, 0xf4, 0x90, 0xad, 0x3c, 0x22, 0x74, 0xeb, 0xe6, 0xc2, 0x82, 0xbc, 0x84, 0x5a, 0x8b, 0x49,
+	0xbc, 0xa8, 0x04, 0xd9, 0xcc, 0xa1, 0x2e, 0xb7, 0x6e, 0x1e, 0x8a, 0x9c, 0xb2, 0x79, 0xc9, 0x85,
+	0x4c, 0x48, 0xed, 0xcc, 0x26, 0x5b, 0x34, 0xde, 0xcd, 0xc7, 0x91, 0xbf, 0x99, 0x26, 0x95, 0xa5,
+	0x6e, 0x6b, 0x21, 0x43, 0xd8, 0x1e, 0x5c, 0xb2, 0x98, 0x38, 0x13, 0xb1, 0x29, 0xe2, 0x99, 0x89,
+	0x59, 0xd9, 0xbb, 0xb9, 0xb0, 0x20, 0x17, 0xb0, 0xd1, 0x62, 0x72, 0xb6, 0x51, 0x90, 0x9d, 0x3b,
+	0x7a, 0xc8, 0xad, 0x7b, 0xd7, 0xa8, 0x20, 0x27, 0xe0, 0xea, 0x50, 0xe6, 0xdf, 0x94, 0x5f, 0x55,
+	0x79, 0xbf, 0x87, 0xed, 0x7c, 0x2b, 0xe4, 0xc9, 0x3d, 0xef, 0x5a, 0x76, 0xeb, 0xde, 0xab, 0x22,
+	0xc8, 0x08, 0xbe, 0x5b, 0x4a, 0x90, 0xc8, 0xcf, 0xac, 0xf9, 0x77, 0xf1, 0x2f, 0xf7, 0x0b, 0x15,
+	0xb1, 0xaa, 0x21, 0xa3, 0x82, 0xc4, 0x59, 0x98, 0x66, 0x18, 0xa2, 0xbb, 0x6c, 0x04, 0x2b, 0xa4,
+	0x69, 0x73, 0xa6, 0x9c, 0x44, 0xba, 0x0b, 0x73, 0x33, 0x7a, 0xf5, 0x2e, 0x99, 0x6d, 0xc8, 0xcc,
+	0xa2, 0x6e, 0xca, 0xa3, 0xdc, 0xe5, 0x63, 0xe8, 0x05, 0x99, 0x8d, 0xf3, 0x6b, 0x36, 0xf5, 0x43,
+	0x45, 0xfd, 0x97, 0x7c, 0xf1, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x96, 0x41, 0xf2, 0xe5, 0xaa,
+	0x14, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2251,6 +2335,7 @@ type TransformClient interface {
 	LoadOptionset(ctx context.Context, in *OptionsetReq, opts ...grpc.CallOption) (*OptionsetRes, error)
 	GetSchoolIds(ctx context.Context, in *SchoolIdsReq, opts ...grpc.CallOption) (*SchoolIdsRes, error)
 	GetCityIds(ctx context.Context, in *CityIdsReq, opts ...grpc.CallOption) (*CityIdsRes, error)
+	GetMkIds(ctx context.Context, in *CityMkReq, opts ...grpc.CallOption) (*CityMkRes, error)
 	PostExcelLog(ctx context.Context, in *ExcelLogReq, opts ...grpc.CallOption) (*ExcelLogRes, error)
 	GetErpOptionset(ctx context.Context, in *OptionCode, opts ...grpc.CallOption) (*Options, error)
 	GetStudent(ctx context.Context, in *StudentReq, opts ...grpc.CallOption) (*StudentRes, error)
@@ -2343,6 +2428,15 @@ func (c *transformClient) GetCityIds(ctx context.Context, in *CityIdsReq, opts .
 	return out, nil
 }
 
+func (c *transformClient) GetMkIds(ctx context.Context, in *CityMkReq, opts ...grpc.CallOption) (*CityMkRes, error) {
+	out := new(CityMkRes)
+	err := c.cc.Invoke(ctx, "/transform.Transform/GetMkIds", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *transformClient) PostExcelLog(ctx context.Context, in *ExcelLogReq, opts ...grpc.CallOption) (*ExcelLogRes, error) {
 	out := new(ExcelLogRes)
 	err := c.cc.Invoke(ctx, "/transform.Transform/PostExcelLog", in, out, opts...)
@@ -2453,6 +2547,7 @@ type TransformServer interface {
 	LoadOptionset(context.Context, *OptionsetReq) (*OptionsetRes, error)
 	GetSchoolIds(context.Context, *SchoolIdsReq) (*SchoolIdsRes, error)
 	GetCityIds(context.Context, *CityIdsReq) (*CityIdsRes, error)
+	GetMkIds(context.Context, *CityMkReq) (*CityMkRes, error)
 	PostExcelLog(context.Context, *ExcelLogReq) (*ExcelLogRes, error)
 	GetErpOptionset(context.Context, *OptionCode) (*Options, error)
 	GetStudent(context.Context, *StudentReq) (*StudentRes, error)
@@ -2499,6 +2594,9 @@ func (*UnimplementedTransformServer) GetSchoolIds(ctx context.Context, req *Scho
 func (*UnimplementedTransformServer) GetCityIds(ctx context.Context, req *CityIdsReq) (*CityIdsRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetCityIds not implemented")
 }
+func (*UnimplementedTransformServer) GetMkIds(ctx context.Context, req *CityMkReq) (*CityMkRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetMkIds not implemented")
+}
 func (*UnimplementedTransformServer) PostExcelLog(ctx context.Context, req *ExcelLogReq) (*ExcelLogRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PostExcelLog not implemented")
 }
@@ -2663,6 +2761,24 @@ func _Transform_GetCityIds_Handler(srv interface{}, ctx context.Context, dec fun
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Transform_GetMkIds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CityMkReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TransformServer).GetMkIds(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/transform.Transform/GetMkIds",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TransformServer).GetMkIds(ctx, req.(*CityMkReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Transform_PostExcelLog_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ExcelLogReq)
 	if err := dec(in); err != nil {
@@ -2893,6 +3009,10 @@ var _Transform_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetCityIds",
 			Handler:    _Transform_GetCityIds_Handler,
 		},
+		{
+			MethodName: "GetMkIds",
+			Handler:    _Transform_GetMkIds_Handler,
+		},
 		{
 			MethodName: "PostExcelLog",
 			Handler:    _Transform_PostExcelLog_Handler,

transformclient/transform.go

@@ -14,46 +14,48 @@ import (
 )
 
 type (
-	BytesResp                    = transform.BytesResp
-	GetErpActiveReq              = transform.GetErpActiveReq
-	OptionCode                   = transform.OptionCode
-	ExcelLogRes                  = transform.ExcelLogRes
+	Options                      = transform.Options
 	SchoolIdsReq                 = transform.SchoolIdsReq
-	SchoolIdsRes                 = transform.SchoolIdsRes
-	TreeNodes                    = transform.TreeNodes
-	ResponseByte                 = transform.ResponseByte
-	ListOfInt                    = transform.ListOfInt
+	Empty                        = transform.Empty
+	ErpMktNetWorkDetailReq       = transform.ErpMktNetWorkDetailReq
+	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
+	DataPermissionRes            = transform.DataPermissionRes
 	MktRes                       = transform.MktRes
-	OptionsetReq                 = transform.OptionsetReq
-	ExcelLogReq                  = transform.ExcelLogReq
-	GetErpActiveRes              = transform.GetErpActiveRes
-	OptionsetRes                 = transform.OptionsetRes
-	CityIdsReq                   = transform.CityIdsReq
-	GetErpRoleRes                = transform.GetErpRoleRes
 	TokenRequest                 = transform.TokenRequest
-	TokenResponse                = transform.TokenResponse
-	Empty                        = transform.Empty
+	OptionsetReq                 = transform.OptionsetReq
+	BytesResp                    = transform.BytesResp
 	GetErpRoleReq                = transform.GetErpRoleReq
-	Active                       = transform.Active
-	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
-	OrganSchool                  = transform.OrganSchool
+	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
+	GetErpActiveReq              = transform.GetErpActiveReq
 	MktReq                       = transform.MktReq
-	StudentRes                   = transform.StudentRes
-	UserRequest                  = transform.UserRequest
+	TokenResponse                = transform.TokenResponse
+	ErpMktNetWorkDetailRes       = transform.ErpMktNetWorkDetailRes
+	OptionsetRes                 = transform.OptionsetRes
+	OptionCode                   = transform.OptionCode
+	CityMkRes                    = transform.CityMkRes
+	Active                       = transform.Active
 	Tag                          = transform.Tag
-	Options                      = transform.Options
-	ErpMktNetWorkDetailReq       = transform.ErpMktNetWorkDetailReq
-	CityIdsRes                   = transform.CityIdsRes
-	DataPermissionReq            = transform.DataPermissionReq
+	ResponseByte                 = transform.ResponseByte
+	OrganSchool                  = transform.OrganSchool
 	StudentReq                   = transform.StudentReq
+	CityMkReq                    = transform.CityMkReq
+	BytesReq                     = transform.BytesReq
+	TreeNodes                    = transform.TreeNodes
 	TreeNode                     = transform.TreeNode
+	ExcelLogReq                  = transform.ExcelLogReq
+	ExcelLogRes                  = transform.ExcelLogRes
+	SchoolIdsRes                 = transform.SchoolIdsRes
+	CityIdsReq                   = transform.CityIdsReq
+	DataPermissionReq            = transform.DataPermissionReq
+	UserRequest                  = transform.UserRequest
+	UserResponse                 = transform.UserResponse
+	ListOfInt                    = transform.ListOfInt
+	GetErpRoleRes                = transform.GetErpRoleRes
+	GetErpActiveRes              = transform.GetErpActiveRes
 	ErpMktNetWorkDetail          = transform.ErpMktNetWorkDetail
-	ErpMktNetWorkDetailRes       = transform.ErpMktNetWorkDetailRes
+	CityIdsRes                   = transform.CityIdsRes
 	GetErpSchoolRes              = transform.GetErpSchoolRes
-	DataPermissionRes            = transform.DataPermissionRes
-	UserResponse                 = transform.UserResponse
-	BytesReq                     = transform.BytesReq
-	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
+	StudentRes                   = transform.StudentRes
 
 	Transform interface {
 		GetUser(ctx context.Context, in *UserRequest) (*UserResponse, error)
@@ -65,6 +67,7 @@ type (
 		LoadOptionset(ctx context.Context, in *OptionsetReq) (*OptionsetRes, error)
 		GetSchoolIds(ctx context.Context, in *SchoolIdsReq) (*SchoolIdsRes, error)
 		GetCityIds(ctx context.Context, in *CityIdsReq) (*CityIdsRes, error)
+		GetMkIds(ctx context.Context, in *CityMkReq) (*CityMkRes, error)
 		PostExcelLog(ctx context.Context, in *ExcelLogReq) (*ExcelLogRes, error)
 		GetErpOptionset(ctx context.Context, in *OptionCode) (*Options, error)
 		GetStudent(ctx context.Context, in *StudentReq) (*StudentRes, error)
@@ -134,6 +137,11 @@ func (m *defaultTransform) GetCityIds(ctx context.Context, in *CityIdsReq) (*Cit
 	return client.GetCityIds(ctx, in)
 }
 
+func (m *defaultTransform) GetMkIds(ctx context.Context, in *CityMkReq) (*CityMkRes, error) {
+	client := transform.NewTransformClient(m.cli.Conn())
+	return client.GetMkIds(ctx, in)
+}
+
 func (m *defaultTransform) PostExcelLog(ctx context.Context, in *ExcelLogReq) (*ExcelLogRes, error) {
 	client := transform.NewTransformClient(m.cli.Conn())
 	return client.PostExcelLog(ctx, in)