SCRUM-3985:增加查询内容

go.mod

@@ -3,7 +3,7 @@ module git.i2edu.net/i2/i2-bill-erp
 go 1.16
 
 require (
-	git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f
+	git.i2edu.net/i2/go-zero v1.0.1
 	github.com/Chronokeeper/anyxml v0.0.0-20160530174208-54457d8e98c6 // indirect
 	github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
 	github.com/CloudyKit/jet v2.1.2+incompatible // indirect

go.sum

@@ -1,6 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f h1:zD6rIG7+PhJwYXuQbHyw1pn/z5oUXzrUg9bo9F9+b5k=
-git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f/go.mod h1:a9idDtfMmMXrZIHyDg6XnYjWuCpKG0I6zv6Vo9Fpncc=
+git.i2edu.net/i2/go-zero v1.0.1 h1:A/fH/+hr5D0eI+7sQyottUjtP8nAxE1pXAOsBV09msg=
+git.i2edu.net/i2/go-zero v1.0.1/go.mod h1:a9idDtfMmMXrZIHyDg6XnYjWuCpKG0I6zv6Vo9Fpncc=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=

internal/logic/get_erp_user_logic.go

@@ -35,6 +35,7 @@ func (l *GetErpUserLogic) GetErpUser(in *transform.ErpUserReq) (*transform.ErpUs
 	}
 	if findOne.OsId != "" {
 		res.OsId = findOne.OsId
+		res.OsName = findOne.OsName
 	}
 	return res, nil
 }

model/sys_user_model.go

@@ -39,7 +39,8 @@ type (
 		table string
 	}
 	SysUserSchool struct {
-		OsId string `db:"os_id"`
+		OsId   string `db:"os_id"`
+		OsName string `db:"os_name"`
 	}
 	SysUser struct {
 		Status         sql.NullInt64  `db:"status"`
@@ -139,7 +140,7 @@ func (m *defaultSysUserModel) FindOrgById(id string) (school *SysUserSchool, err
 	erpUserOrgIdKey := fmt.Sprintf("%s%v", cacheSysUserOrgIdPrefix, id)
 	var resp SysUserSchool
 	err = m.QueryRow(&resp, erpUserOrgIdKey, func(conn sqlx.SqlConn, v interface{}) error {
-		query := fmt.Sprintf("select os_id from sys_user_school where `id` = ? limit 1")
+		query := fmt.Sprintf("select sys_user_school.os_id,base_organ_scholl.name os_name from sys_user_school join base_organ_school  on  sys_user_school.os_id = base_organ_school.id where sys_user_school.`user_id` = ? limit 1")
 		return conn.QueryRow(v, query, id)
 	})
 	switch err {

transform.proto

@@ -239,6 +239,7 @@ message ErpUserReq{
 }
 message ErpUserRes {
   string OsId = 1;
+  string OsName = 2;
 }
 service Transform {
   rpc GetUser(UserRequest) returns(UserResponse);

transform/transform.pb.go

@@ -2207,6 +2207,7 @@ func (m *ErpUserReq) GetErpId() string {
 
 type ErpUserRes struct {
 	OsId                 string   `protobuf:"bytes,1,opt,name=OsId,proto3" json:"OsId,omitempty"`
+	OsName               string   `protobuf:"bytes,2,opt,name=OsName,proto3" json:"OsName,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -2244,6 +2245,13 @@ func (m *ErpUserRes) GetOsId() string {
 	return ""
 }
 
+func (m *ErpUserRes) GetOsName() string {
+	if m != nil {
+		return m.OsName
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*UserRequest)(nil), "transform.UserRequest")
 	proto.RegisterType((*UserResponse)(nil), "transform.UserResponse")
@@ -2299,118 +2307,119 @@ func init() {
 func init() { proto.RegisterFile("transform.proto", fileDescriptor_cb4a498eeb2ba07d) }
 
 var fileDescriptor_cb4a498eeb2ba07d = []byte{
-	// 1770 bytes of a gzipped FileDescriptorProto
+	// 1778 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x73, 0x23, 0x49,
 	0x11, 0x0e, 0x49, 0xd6, 0x2b, 0x25, 0xdb, 0xe3, 0x1a, 0x3f, 0x7a, 0x1b, 0xb3, 0x78, 0x8b, 0x01,
-	0x3c, 0x1c, 0x7c, 0x98, 0x25, 0x96, 0x0d, 0xb3, 0xb1, 0xac, 0x5f, 0xab, 0x50, 0x84, 0x65, 0x1b,
-	0xc9, 0x1b, 0x04, 0x17, 0x1c, 0xbd, 0xea, 0x1a, 0xb9, 0x51, 0xab, 0xab, 0xdd, 0x55, 0x1a, 0x46,
+	0x3c, 0x1c, 0x7c, 0x98, 0x25, 0x96, 0x09, 0xb3, 0xb1, 0xac, 0x5f, 0xab, 0x50, 0x84, 0x65, 0x1b,
+	0xc9, 0x1b, 0x04, 0x17, 0x1c, 0xbd, 0xea, 0x5a, 0xb9, 0x51, 0xab, 0xab, 0xdd, 0x55, 0x1a, 0x46,
 	0x77, 0x82, 0x03, 0x57, 0x08, 0x6e, 0xf0, 0x8f, 0xb8, 0x71, 0xe3, 0xcf, 0x10, 0x59, 0x55, 0xdd,
 	0x5d, 0x92, 0x5a, 0xf6, 0x0c, 0xc3, 0xdc, 0x3a, 0xb3, 0xb2, 0xb2, 0x32, 0xb3, 0xb2, 0x32, 0xbf,
-	0x6c, 0xd8, 0x94, 0x89, 0x17, 0x89, 0xd7, 0x3c, 0x99, 0x1c, 0xc5, 0x09, 0x97, 0x9c, 0x34, 0x33,
-	0x06, 0xfd, 0x1c, 0x5a, 0xdf, 0x09, 0x96, 0xf4, 0xd9, 0xc3, 0x94, 0x09, 0x49, 0x36, 0xa0, 0x1c,
-	0xf8, 0x4e, 0xe9, 0xa0, 0x74, 0xd8, 0xec, 0x97, 0x03, 0x9f, 0x6c, 0x43, 0x35, 0xbe, 0xe7, 0x11,
-	0x73, 0xca, 0x8a, 0xa5, 0x09, 0xfa, 0xef, 0x12, 0xb4, 0xf5, 0x2e, 0x11, 0xf3, 0x48, 0xb0, 0x77,
-	0xdb, 0x86, 0xdc, 0x84, 0x87, 0x4c, 0x38, 0x15, 0xcd, 0x55, 0x04, 0xd9, 0x85, 0x9a, 0x90, 0x9e,
-	0x9c, 0x0a, 0x67, 0xed, 0xa0, 0x74, 0x58, 0xe9, 0x1b, 0x8a, 0x1c, 0x40, 0x8b, 0x25, 0x71, 0x9f,
-	0x87, 0xec, 0x76, 0x16, 0x33, 0xa7, 0xaa, 0x16, 0x6d, 0x16, 0x71, 0xa1, 0x31, 0x15, 0x2c, 0xb9,
-	0xf2, 0x26, 0xcc, 0xa9, 0x29, 0x95, 0x19, 0x8d, 0x6b, 0xc3, 0x40, 0xce, 0xd4, 0x5a, 0x5d, 0xaf,
-	0xa5, 0x34, 0x9e, 0x38, 0x62, 0x91, 0xcf, 0x12, 0xa7, 0xa1, 0x4f, 0xd4, 0x14, 0x7d, 0x01, 0xed,
-	0x5b, 0x3e, 0x66, 0x51, 0x1a, 0x8c, 0x6d, 0xa8, 0x4a, 0xa4, 0x8d, 0x63, 0x9a, 0xa0, 0xff, 0x28,
-	0xc3, 0xba, 0x11, 0x33, 0xde, 0xef, 0x42, 0x0d, 0xa3, 0xd1, 0x4d, 0x23, 0x60, 0x28, 0xf4, 0x40,
-	0x45, 0x89, 0x87, 0xac, 0xeb, 0x0b, 0x13, 0x0b, 0x9b, 0x45, 0x5e, 0xc0, 0x3a, 0x92, 0x83, 0xe1,
-	0x3d, 0xe7, 0x21, 0xca, 0xe8, 0xc8, 0xcc, 0x33, 0xc9, 0x21, 0x6c, 0x22, 0xe3, 0x26, 0xe1, 0x6f,
-	0x82, 0x68, 0xa8, 0x74, 0xad, 0x29, 0xb9, 0x45, 0x36, 0xa1, 0xfa, 0x5e, 0xae, 0x93, 0x91, 0x17,
-	0xa1, 0x58, 0x55, 0x89, 0xcd, 0xf1, 0xd0, 0xaa, 0xc1, 0x4c, 0xa4, 0xda, 0x4d, 0xe0, 0x6c, 0x16,
-	0xf9, 0x14, 0x60, 0x30, 0x13, 0x66, 0x83, 0x89, 0x9e, 0xc5, 0x21, 0xfb, 0xd0, 0x54, 0x07, 0xab,
-	0x1b, 0x6e, 0xa8, 0xe5, 0x9c, 0x41, 0xeb, 0x50, 0xbd, 0x98, 0xc4, 0x72, 0x46, 0xbf, 0x80, 0xe6,
-	0x6d, 0xc2, 0xd8, 0x15, 0xf7, 0x99, 0x20, 0x2f, 0xa1, 0x1a, 0xe1, 0x87, 0x53, 0x3a, 0xa8, 0x1c,
-	0xb6, 0x5e, 0x3d, 0x3f, 0xca, 0x73, 0x32, 0x15, 0xea, 0x6b, 0x09, 0xfa, 0xd7, 0x12, 0x34, 0x52,
-	0x9e, 0x95, 0x59, 0x15, 0x95, 0x59, 0x04, 0xd6, 0x24, 0x7b, 0x2b, 0x4d, 0x30, 0xd5, 0x37, 0xc6,
-	0x3f, 0xf6, 0x12, 0x16, 0x49, 0x15, 0xbe, 0x4a, 0xdf, 0x50, 0xe4, 0x00, 0x2a, 0xd2, 0x1b, 0xa9,
-	0x58, 0xb5, 0x5e, 0x6d, 0xd8, 0x27, 0x7a, 0xa3, 0x3e, 0x2e, 0xe5, 0x56, 0x55, 0x9f, 0xb4, 0xea,
-	0x9f, 0x25, 0x78, 0x7e, 0x91, 0xc4, 0xbd, 0xb1, 0xbc, 0x62, 0xf2, 0xb7, 0x3c, 0x19, 0x9f, 0x33,
-	0xe9, 0x05, 0xe1, 0x7b, 0xa8, 0xf8, 0x40, 0x5f, 0x5a, 0x41, 0x74, 0xcf, 0x92, 0x40, 0x7a, 0xd1,
-	0x90, 0x99, 0xfb, 0xb7, 0x59, 0xf4, 0x0a, 0x76, 0x0b, 0xec, 0xeb, 0x33, 0x41, 0x7e, 0x01, 0xd5,
-	0x40, 0xb2, 0x49, 0x6a, 0xe2, 0xa7, 0x96, 0x89, 0x45, 0x3b, 0xb4, 0x30, 0xfd, 0xf9, 0x0a, 0x7d,
-	0x0f, 0xe4, 0x19, 0x54, 0x02, 0x5f, 0x98, 0x64, 0xc7, 0x4f, 0xfa, 0x12, 0x2a, 0xb7, 0xde, 0xa8,
-	0xc8, 0xc1, 0x08, 0x1f, 0xa0, 0x71, 0x10, 0xbf, 0x29, 0x85, 0xf6, 0x75, 0x2c, 0x03, 0x7c, 0x38,
-	0x12, 0x95, 0x11, 0x58, 0x1b, 0x72, 0x9f, 0x19, 0x6d, 0xea, 0x9b, 0xfe, 0xa5, 0x34, 0x27, 0x24,
-	0xc8, 0xd7, 0x50, 0x9f, 0x78, 0xf1, 0x65, 0x20, 0xa4, 0xc9, 0x9f, 0x17, 0x96, 0x0f, 0xb6, 0xe4,
-	0x51, 0x4f, 0x8b, 0x5d, 0x44, 0x32, 0x99, 0xf5, 0xd3, 0x4d, 0xee, 0x31, 0xb4, 0xed, 0x05, 0xf4,
-	0x60, 0xcc, 0x66, 0xa9, 0x07, 0x63, 0x36, 0xc3, 0xb7, 0xfe, 0xc6, 0x0b, 0xa7, 0x59, 0xc5, 0x52,
-	0xc4, 0x71, 0xf9, 0xcb, 0x12, 0x3d, 0x00, 0xd0, 0x27, 0x9c, 0x61, 0x3e, 0x16, 0x99, 0xdb, 0x81,
+	0x6c, 0xd8, 0x94, 0x89, 0x17, 0x89, 0xef, 0x79, 0x32, 0x39, 0x8a, 0x13, 0x2e, 0x39, 0x69, 0x66,
+	0x0c, 0xfa, 0x39, 0xb4, 0xbe, 0x15, 0x2c, 0xe9, 0xb3, 0x87, 0x29, 0x13, 0x92, 0x6c, 0x40, 0x39,
+	0xf0, 0x9d, 0xd2, 0x41, 0xe9, 0xb0, 0xd9, 0x2f, 0x07, 0x3e, 0xd9, 0x86, 0x6a, 0x7c, 0xcf, 0x23,
+	0xe6, 0x94, 0x15, 0x4b, 0x13, 0xf4, 0xdf, 0x25, 0x68, 0xeb, 0x5d, 0x22, 0xe6, 0x91, 0x60, 0xef,
+	0xb6, 0x0d, 0xb9, 0x09, 0x0f, 0x99, 0x70, 0x2a, 0x9a, 0xab, 0x08, 0xb2, 0x0b, 0x35, 0x21, 0x3d,
+	0x39, 0x15, 0xce, 0xda, 0x41, 0xe9, 0xb0, 0xd2, 0x37, 0x14, 0x39, 0x80, 0x16, 0x4b, 0xe2, 0x3e,
+	0x0f, 0xd9, 0xed, 0x2c, 0x66, 0x4e, 0x55, 0x2d, 0xda, 0x2c, 0xe2, 0x42, 0x63, 0x2a, 0x58, 0x72,
+	0xe5, 0x4d, 0x98, 0x53, 0x53, 0x2a, 0x33, 0x1a, 0xd7, 0x86, 0x81, 0x9c, 0xa9, 0xb5, 0xba, 0x5e,
+	0x4b, 0x69, 0x3c, 0x71, 0xc4, 0x22, 0x9f, 0x25, 0x4e, 0x43, 0x9f, 0xa8, 0x29, 0xfa, 0x02, 0xda,
+	0xb7, 0x7c, 0xcc, 0xa2, 0x34, 0x18, 0xdb, 0x50, 0x95, 0x48, 0x1b, 0xc7, 0x34, 0x41, 0xff, 0x51,
+	0x86, 0x75, 0x23, 0x66, 0xbc, 0xdf, 0x85, 0x1a, 0x46, 0xa3, 0x9b, 0x46, 0xc0, 0x50, 0xe8, 0x81,
+	0x8a, 0x12, 0x0f, 0x59, 0xd7, 0x17, 0x26, 0x16, 0x36, 0x8b, 0xbc, 0x80, 0x75, 0x24, 0x07, 0xc3,
+	0x7b, 0xce, 0x43, 0x94, 0xd1, 0x91, 0x99, 0x67, 0x92, 0x43, 0xd8, 0x44, 0xc6, 0x4d, 0xc2, 0xdf,
+	0x04, 0xd1, 0x50, 0xe9, 0x5a, 0x53, 0x72, 0x8b, 0x6c, 0x42, 0xf5, 0xbd, 0x5c, 0x27, 0x23, 0x2f,
+	0x42, 0xb1, 0xaa, 0x12, 0x9b, 0xe3, 0xa1, 0x55, 0x83, 0x99, 0x48, 0xb5, 0x9b, 0xc0, 0xd9, 0x2c,
+	0xf2, 0x29, 0xc0, 0x60, 0x26, 0xcc, 0x06, 0x13, 0x3d, 0x8b, 0x43, 0xf6, 0xa1, 0xa9, 0x0e, 0x56,
+	0x37, 0xdc, 0x50, 0xcb, 0x39, 0x83, 0xd6, 0xa1, 0x7a, 0x31, 0x89, 0xe5, 0x8c, 0x7e, 0x01, 0xcd,
+	0xdb, 0x84, 0xb1, 0x2b, 0xee, 0x33, 0x41, 0x5e, 0x42, 0x35, 0xc2, 0x0f, 0xa7, 0x74, 0x50, 0x39,
+	0x6c, 0xbd, 0x7a, 0x7e, 0x94, 0xe7, 0x64, 0x2a, 0xd4, 0xd7, 0x12, 0xf4, 0xaf, 0x25, 0x68, 0xa4,
+	0x3c, 0x2b, 0xb3, 0x2a, 0x2a, 0xb3, 0x08, 0xac, 0x49, 0xf6, 0x56, 0x9a, 0x60, 0xaa, 0x6f, 0x8c,
+	0x7f, 0xec, 0x25, 0x2c, 0x92, 0x2a, 0x7c, 0x95, 0xbe, 0xa1, 0xc8, 0x01, 0x54, 0xa4, 0x37, 0x52,
+	0xb1, 0x6a, 0xbd, 0xda, 0xb0, 0x4f, 0xf4, 0x46, 0x7d, 0x5c, 0xca, 0xad, 0xaa, 0x3e, 0x69, 0xd5,
+	0x3f, 0x4b, 0xf0, 0xfc, 0x22, 0x89, 0x7b, 0x63, 0x79, 0xc5, 0xe4, 0x6f, 0x79, 0x32, 0x3e, 0x67,
+	0xd2, 0x0b, 0xc2, 0xf7, 0x50, 0xf1, 0x81, 0xbe, 0xb4, 0x82, 0xe8, 0x9e, 0x25, 0x81, 0xf4, 0xa2,
+	0x21, 0x33, 0xf7, 0x6f, 0xb3, 0xe8, 0x15, 0xec, 0x16, 0xd8, 0xd7, 0x67, 0x82, 0xfc, 0x02, 0xaa,
+	0x81, 0x64, 0x93, 0xd4, 0xc4, 0x4f, 0x2d, 0x13, 0x8b, 0x76, 0x68, 0x61, 0xfa, 0xf3, 0x15, 0xfa,
+	0x1e, 0xc8, 0x33, 0xa8, 0x04, 0xbe, 0x30, 0xc9, 0x8e, 0x9f, 0xf4, 0x25, 0x54, 0x6e, 0xbd, 0x51,
+	0x91, 0x83, 0x11, 0x3e, 0x40, 0xe3, 0x20, 0x7e, 0x53, 0x0a, 0xed, 0xeb, 0x58, 0x06, 0xf8, 0x70,
+	0x24, 0x2a, 0x23, 0xb0, 0x36, 0xe4, 0x3e, 0x33, 0xda, 0xd4, 0x37, 0xfd, 0x4b, 0x69, 0x4e, 0x48,
+	0x90, 0xaf, 0xa0, 0x3e, 0xf1, 0xe2, 0xcb, 0x40, 0x48, 0x93, 0x3f, 0x2f, 0x2c, 0x1f, 0x6c, 0xc9,
+	0xa3, 0x9e, 0x16, 0xbb, 0x88, 0x64, 0x32, 0xeb, 0xa7, 0x9b, 0xdc, 0x63, 0x68, 0xdb, 0x0b, 0xe8,
+	0xc1, 0x98, 0xcd, 0x52, 0x0f, 0xc6, 0x6c, 0x86, 0x6f, 0xfd, 0x8d, 0x17, 0x4e, 0xb3, 0x8a, 0xa5,
+	0x88, 0xe3, 0xf2, 0xeb, 0x12, 0x3d, 0x00, 0xd0, 0x27, 0x9c, 0x61, 0x3e, 0x16, 0x99, 0xdb, 0x81,
 	0xba, 0xb1, 0xa1, 0x68, 0xb9, 0x28, 0x0a, 0xf9, 0x71, 0x15, 0xeb, 0x38, 0x8c, 0x4d, 0x5a, 0x54,
 	0x4e, 0x67, 0x52, 0xed, 0xf4, 0x3d, 0xe9, 0x29, 0x6d, 0xed, 0xbe, 0xfa, 0xa6, 0xff, 0x29, 0x41,
 	0xeb, 0xe2, 0xed, 0x90, 0x85, 0x97, 0x7c, 0x84, 0xf1, 0xdb, 0x85, 0x5a, 0x8f, 0xfb, 0xd3, 0x30,
 	0x3d, 0xd3, 0x50, 0xb8, 0xf7, 0x8c, 0x47, 0x7e, 0x7a, 0x2a, 0x7e, 0x63, 0x51, 0x3c, 0x4b, 0x98,
 	0x27, 0xd9, 0xe9, 0xcc, 0x1c, 0x9c, 0xd1, 0xf8, 0xe8, 0xf5, 0xf7, 0x6d, 0x30, 0x49, 0xf3, 0xcb,
-	0xe2, 0x60, 0x69, 0xb9, 0xf4, 0x84, 0xfc, 0x2e, 0xf6, 0xf5, 0x7e, 0x53, 0x5a, 0x6c, 0x1e, 0xf9,
-	0x29, 0x6c, 0xe4, 0xb4, 0xd2, 0xa3, 0xab, 0xcb, 0x02, 0x97, 0x38, 0x50, 0x3f, 0x67, 0xe1, 0xb7,
+	0xe2, 0x60, 0x69, 0xb9, 0xf4, 0x84, 0xfc, 0x36, 0xf6, 0xf5, 0x7e, 0x53, 0x5a, 0x6c, 0x1e, 0xf9,
+	0x29, 0x6c, 0xe4, 0xb4, 0xd2, 0xa3, 0xab, 0xcb, 0x02, 0x97, 0x38, 0x50, 0x3f, 0x67, 0xe1, 0x37,
 	0xa1, 0x37, 0x32, 0xd5, 0x25, 0x25, 0xe9, 0x4f, 0x6c, 0xe7, 0x54, 0x6f, 0x18, 0xe8, 0xde, 0xa0,
 	0x93, 0xca, 0x50, 0x58, 0xa9, 0xb3, 0xf2, 0x88, 0x41, 0xd8, 0x86, 0x2a, 0x86, 0x55, 0x57, 0x97,
-	0x66, 0x5f, 0x13, 0xf4, 0x87, 0xd0, 0xc4, 0x2b, 0xbf, 0x7e, 0xdd, 0x8d, 0x64, 0x9e, 0xb4, 0x95,
-	0xc3, 0x8a, 0x4e, 0x5a, 0xcc, 0x32, 0x4b, 0xcb, 0x13, 0x59, 0x66, 0x4b, 0xfe, 0x7f, 0xb2, 0xac,
-	0x62, 0x67, 0x19, 0x05, 0x38, 0x0b, 0xe4, 0x6c, 0xd9, 0x9f, 0x52, 0xee, 0xcf, 0x8f, 0xa1, 0x89,
-	0x32, 0xbd, 0xb1, 0xb9, 0x77, 0xd5, 0x55, 0x53, 0x19, 0x43, 0xd1, 0x3f, 0x97, 0x2c, 0x4d, 0x82,
-	0x7c, 0xb5, 0xe8, 0x13, 0xb5, 0x7c, 0xca, 0xe5, 0x3e, 0x82, 0x47, 0x7f, 0x2a, 0xe5, 0xe6, 0x0a,
-	0xf2, 0xab, 0x45, 0x3b, 0x3e, 0x5b, 0xb0, 0x43, 0x89, 0x7d, 0x84, 0xe7, 0xbb, 0x0f, 0x0d, 0x7c,
-	0x4b, 0xc2, 0x14, 0xae, 0x84, 0x3d, 0x98, 0xe7, 0x84, 0x9f, 0xf4, 0x47, 0xd0, 0x34, 0xab, 0x22,
-	0xc6, 0x27, 0x93, 0x30, 0x11, 0xa7, 0xcf, 0x0d, 0xbf, 0xe9, 0x00, 0xd6, 0x3b, 0x4c, 0x5e, 0x68,
-	0xd4, 0x81, 0x8e, 0xec, 0x41, 0x1d, 0x41, 0xc6, 0x5d, 0x86, 0x77, 0x6a, 0x53, 0xdd, 0xed, 0x71,
-	0x37, 0x0f, 0xb3, 0x67, 0x8e, 0xdf, 0x64, 0x07, 0x6a, 0x62, 0x78, 0x8f, 0xb2, 0xba, 0x9a, 0x57,
-	0xc5, 0xf0, 0xbe, 0xeb, 0xd3, 0x6f, 0xe6, 0x95, 0xaa, 0xcb, 0x9c, 0xf0, 0xef, 0x83, 0xfc, 0x11,
-	0x6b, 0xca, 0x3e, 0xac, 0x6c, 0x1f, 0x46, 0x7f, 0x09, 0xfb, 0x5a, 0x83, 0xea, 0xc9, 0x83, 0xe1,
-	0xfd, 0x0d, 0x4b, 0x4e, 0x67, 0x1a, 0x77, 0xa0, 0xc2, 0x55, 0x56, 0xd2, 0xab, 0x47, 0x37, 0x0a,
-	0x72, 0xa4, 0x2c, 0xe6, 0x3c, 0x34, 0xd7, 0xb4, 0x6b, 0x17, 0x5a, 0xb3, 0x85, 0xf3, 0xb0, 0x6f,
-	0xa4, 0xe8, 0x25, 0xb4, 0x2c, 0xf6, 0xbb, 0x74, 0x00, 0xf2, 0x09, 0x34, 0x38, 0x6e, 0xc9, 0xc3,
-	0x52, 0xe7, 0x1a, 0x59, 0xd0, 0x13, 0xd8, 0xd4, 0xd6, 0x99, 0x53, 0xfe, 0x07, 0x83, 0x0e, 0x53,
-	0x15, 0x27, 0x43, 0x19, 0xbc, 0x51, 0xd1, 0xcd, 0x6f, 0x01, 0x0d, 0x5b, 0x4b, 0x6f, 0xe1, 0xab,
-	0x45, 0x49, 0x44, 0x29, 0x35, 0x4f, 0x11, 0xe6, 0xb0, 0x2d, 0xeb, 0x30, 0x23, 0x65, 0x04, 0xe8,
-	0xd7, 0x50, 0xd3, 0x1c, 0xf2, 0x03, 0x68, 0x6a, 0xde, 0x5d, 0xe6, 0x7a, 0x43, 0x33, 0xba, 0x3e,
-	0x5e, 0xc4, 0xc4, 0xbb, 0xb3, 0x62, 0x50, 0x9b, 0x78, 0x08, 0x42, 0x69, 0x17, 0xb6, 0xce, 0x3d,
-	0xe9, 0xdd, 0xb0, 0x64, 0x12, 0x08, 0x11, 0x70, 0x44, 0x9d, 0xa8, 0x2a, 0x99, 0x86, 0xec, 0xce,
-	0xea, 0x21, 0x0d, 0x64, 0xa8, 0xd6, 0xb3, 0x32, 0x19, 0xfe, 0x56, 0x5a, 0xd6, 0x25, 0xc8, 0xd9,
-	0xe2, 0x8b, 0x7b, 0x69, 0x39, 0xb3, 0x24, 0xfe, 0x11, 0x5e, 0xde, 0xdf, 0xab, 0x50, 0xeb, 0x8d,
-	0x55, 0x93, 0xdf, 0x80, 0x72, 0x37, 0x4b, 0x0b, 0xfd, 0x56, 0x7a, 0xe3, 0x6e, 0xd6, 0x9c, 0xf0,
-	0x1b, 0x9b, 0xc7, 0x8d, 0x97, 0x48, 0x6c, 0x10, 0x06, 0x4d, 0xeb, 0xe4, 0x58, 0xe0, 0x5a, 0x68,
-	0xdb, 0xcc, 0x0b, 0x86, 0xef, 0x40, 0x7d, 0x20, 0xa7, 0x0a, 0xf0, 0xeb, 0xde, 0x94, 0x92, 0xd8,
-	0xf6, 0x4e, 0x46, 0xac, 0x93, 0xf0, 0x69, 0xac, 0x1a, 0x52, 0xa5, 0x9f, 0xd1, 0x88, 0xc0, 0x07,
-	0x72, 0x7a, 0x19, 0x44, 0xe3, 0x1b, 0x96, 0x08, 0x1e, 0xa9, 0x86, 0x54, 0xe9, 0xcf, 0x33, 0x51,
-	0xc3, 0x40, 0x4e, 0x6d, 0xc0, 0x9b, 0xd1, 0x18, 0x80, 0x01, 0xe6, 0x93, 0xd3, 0xd4, 0x4f, 0x5c,
-	0x11, 0x68, 0xcd, 0x89, 0xef, 0x27, 0x4c, 0x08, 0x07, 0xb4, 0x35, 0x86, 0x5c, 0x68, 0xb4, 0xad,
-	0xa5, 0x46, 0x6b, 0x35, 0xc7, 0xb6, 0x7e, 0x1d, 0x86, 0x54, 0x3b, 0xef, 0xd9, 0x70, 0x8c, 0x4d,
-	0x90, 0x39, 0xeb, 0x6a, 0xd1, 0xe2, 0x20, 0x2e, 0x57, 0x94, 0x52, 0xbc, 0xa1, 0x71, 0x79, 0xc6,
-	0x40, 0xbd, 0x8a, 0x38, 0x9d, 0x39, 0x9b, 0xda, 0x22, 0x43, 0xe2, 0x7c, 0x71, 0xc5, 0xe4, 0x1f,
-	0x33, 0x8c, 0xd7, 0xf5, 0x9d, 0x67, 0x4a, 0xf9, 0x22, 0x5b, 0x45, 0xd2, 0x64, 0xb6, 0xb3, 0x65,
-	0x22, 0x99, 0x66, 0x3a, 0x82, 0x0b, 0x2f, 0x0c, 0xd5, 0xb0, 0x46, 0xf4, 0x5a, 0x4a, 0x2b, 0x90,
-	0xe2, 0xa9, 0x95, 0xe7, 0xfa, 0xce, 0x34, 0x85, 0x36, 0xfd, 0x66, 0xea, 0xf1, 0xdf, 0xfd, 0x21,
-	0x70, 0xb6, 0xb5, 0xaf, 0x86, 0xc4, 0x7b, 0xe9, 0x8d, 0xa5, 0x52, 0xae, 0x9a, 0x94, 0xb3, 0xa3,
-	0xef, 0x65, 0x8e, 0x89, 0x1e, 0x5f, 0x72, 0xcf, 0xd7, 0xf1, 0xdf, 0x55, 0x12, 0x39, 0x03, 0x4f,
-	0xed, 0xb3, 0x89, 0x97, 0x8c, 0x9d, 0x3d, 0xfd, 0x5e, 0x34, 0x45, 0x0f, 0x4c, 0x5e, 0xae, 0xc6,
-	0x17, 0xfb, 0x00, 0x03, 0x39, 0xf5, 0x59, 0x54, 0x94, 0xbd, 0x54, 0x5a, 0xab, 0x62, 0x29, 0xb7,
-	0xed, 0x5c, 0x29, 0x2f, 0xe4, 0xca, 0x07, 0x00, 0x30, 0x44, 0x08, 0x17, 0x49, 0x6c, 0x86, 0x75,
-	0xcc, 0xba, 0x8b, 0x24, 0xce, 0x46, 0x4e, 0x4d, 0x20, 0x56, 0xcd, 0x64, 0x14, 0x18, 0xbd, 0x16,
-	0x99, 0x88, 0xfa, 0x7e, 0xf5, 0x2f, 0xc0, 0xa9, 0xcc, 0x94, 0x01, 0x72, 0x0c, 0xf5, 0x0e, 0x93,
-	0x28, 0x4f, 0xec, 0xba, 0x6a, 0xfd, 0x11, 0x70, 0xf7, 0x96, 0xf8, 0x66, 0xea, 0xfd, 0x35, 0xc0,
-	0x8d, 0x97, 0x08, 0xa6, 0x66, 0x61, 0x62, 0x8b, 0xd9, 0x43, 0xb4, 0xeb, 0x2c, 0x2f, 0x18, 0x05,
-	0x5f, 0xc2, 0x86, 0xae, 0xbf, 0xd8, 0xfe, 0x71, 0x56, 0x22, 0xcf, 0xec, 0xc9, 0x04, 0x67, 0x48,
-	0x77, 0xbb, 0x60, 0x9c, 0x52, 0x3d, 0xe1, 0xc4, 0xf7, 0x7b, 0x63, 0x49, 0xec, 0x02, 0xad, 0x6b,
-	0x8d, 0xbb, 0xc4, 0x12, 0xe4, 0x04, 0xd6, 0x31, 0x2b, 0xb2, 0x41, 0x61, 0xce, 0x5a, 0x7b, 0x1a,
-	0x71, 0x57, 0x2c, 0x08, 0xf2, 0x0d, 0xb4, 0x3b, 0x4c, 0xe6, 0x33, 0xf9, 0x5e, 0x31, 0x34, 0x9c,
-	0xd7, 0x30, 0x87, 0x2e, 0x8f, 0x01, 0x3a, 0x4c, 0x1a, 0xc8, 0x45, 0x76, 0x8a, 0x60, 0xd8, 0x83,
-	0x5b, 0xc8, 0x16, 0xe4, 0x0b, 0x68, 0x74, 0x98, 0xc4, 0x32, 0x29, 0xc8, 0x76, 0x01, 0x70, 0x7a,
-	0x70, 0x8b, 0xb8, 0x88, 0x68, 0xdb, 0x37, 0x5c, 0xc8, 0x14, 0x52, 0xcf, 0x5d, 0xb2, 0x35, 0x44,
-	0xb8, 0xc5, 0x7c, 0x44, 0x8f, 0xa6, 0x45, 0xe6, 0xa1, 0xdb, 0x59, 0x8a, 0x10, 0x36, 0x27, 0x97,
-	0x2c, 0x07, 0xce, 0x78, 0x6c, 0x9e, 0xca, 0xdc, 0xc6, 0xfc, 0x71, 0xb9, 0x85, 0x6c, 0x41, 0xae,
-	0x61, 0xab, 0xc3, 0xe4, 0x7c, 0x9b, 0x22, 0xfb, 0x8f, 0x74, 0xb0, 0x07, 0xf7, 0xb1, 0x55, 0x41,
-	0xce, 0xc1, 0xd5, 0xae, 0x2c, 0x4e, 0xb4, 0xef, 0x95, 0x79, 0xbf, 0x87, 0xdd, 0x62, 0x2d, 0xe4,
-	0xb3, 0x27, 0xa6, 0x6a, 0xf6, 0xe0, 0x3e, 0x29, 0x22, 0xc8, 0x04, 0x3e, 0x59, 0x09, 0xcf, 0xc8,
-	0xcf, 0xac, 0xfd, 0x8f, 0xa1, 0x3f, 0xf7, 0x1d, 0x05, 0x31, 0xab, 0x21, 0x07, 0xa2, 0xc4, 0x59,
-	0xda, 0x66, 0xf0, 0xa9, 0xbb, 0x6a, 0x05, 0x33, 0xa4, 0x6d, 0x23, 0xb6, 0x82, 0x40, 0xba, 0x4b,
-	0x7b, 0x73, 0x70, 0xf7, 0x6d, 0xba, 0xdb, 0x40, 0xa9, 0x65, 0xd9, 0x0c, 0xc5, 0xb9, 0xab, 0xd7,
-	0xd0, 0x0a, 0x32, 0xef, 0xe7, 0x7b, 0x5d, 0xea, 0x71, 0x1a, 0x05, 0x55, 0x08, 0x77, 0xe6, 0x6f,
-	0xc9, 0xd4, 0x42, 0xb7, 0x90, 0x2d, 0xbe, 0xaf, 0xa9, 0x3f, 0xaa, 0x9f, 0xff, 0x37, 0x00, 0x00,
-	0xff, 0xff, 0x2b, 0x26, 0x85, 0x3d, 0x64, 0x15, 0x00, 0x00,
+	0x66, 0x5f, 0x13, 0xf4, 0x87, 0xd0, 0xc4, 0x2b, 0xbf, 0xfe, 0xbe, 0x1b, 0xc9, 0x3c, 0x69, 0x2b,
+	0x87, 0x15, 0x9d, 0xb4, 0x98, 0x65, 0x96, 0x96, 0x27, 0xb2, 0xcc, 0x96, 0xfc, 0xff, 0x64, 0x59,
+	0xc5, 0xce, 0x32, 0x0a, 0x70, 0x16, 0xc8, 0xd9, 0xb2, 0x3f, 0xa5, 0xdc, 0x9f, 0x1f, 0x43, 0x13,
+	0x65, 0x7a, 0x63, 0x73, 0xef, 0xaa, 0xab, 0xa6, 0x32, 0x86, 0xa2, 0x7f, 0x2e, 0x59, 0x9a, 0x04,
+	0xf9, 0x72, 0xd1, 0x27, 0x6a, 0xf9, 0x94, 0xcb, 0x7d, 0x04, 0x8f, 0xfe, 0x54, 0xca, 0xcd, 0x15,
+	0xe4, 0x57, 0x8b, 0x76, 0x7c, 0xb6, 0x60, 0x87, 0x12, 0xfb, 0x08, 0xcf, 0x77, 0x1f, 0x1a, 0xf8,
+	0x96, 0x84, 0x29, 0x5c, 0x09, 0x7b, 0x30, 0xcf, 0x09, 0x3f, 0xe9, 0x8f, 0xa0, 0x69, 0x56, 0x45,
+	0x8c, 0x4f, 0x26, 0x61, 0x22, 0x4e, 0x9f, 0x1b, 0x7e, 0xd3, 0x01, 0xac, 0x77, 0x98, 0xbc, 0xd0,
+	0xa8, 0x03, 0x1d, 0xd9, 0x83, 0x3a, 0x82, 0x8c, 0xbb, 0x0c, 0xef, 0xd4, 0xa6, 0xba, 0xdb, 0xe3,
+	0x6e, 0x1e, 0x66, 0xcf, 0x1c, 0xbf, 0xc9, 0x0e, 0xd4, 0xc4, 0xf0, 0x1e, 0x65, 0x75, 0x35, 0xaf,
+	0x8a, 0xe1, 0x7d, 0xd7, 0xa7, 0x5f, 0xcf, 0x2b, 0x55, 0x97, 0x39, 0xe1, 0xdf, 0x05, 0xf9, 0x23,
+	0xd6, 0x94, 0x7d, 0x58, 0xd9, 0x3e, 0x8c, 0xfe, 0x12, 0xf6, 0xb5, 0x06, 0xd5, 0x93, 0x07, 0xc3,
+	0xfb, 0x1b, 0x96, 0x9c, 0xce, 0x34, 0xee, 0x40, 0x85, 0xab, 0xac, 0xa4, 0x57, 0x8f, 0x6e, 0x14,
+	0xe4, 0x48, 0x59, 0xcc, 0x79, 0x68, 0xae, 0x69, 0xd7, 0x2e, 0xb4, 0x66, 0x0b, 0xe7, 0x61, 0xdf,
+	0x48, 0xd1, 0x4b, 0x68, 0x59, 0xec, 0x77, 0xe9, 0x00, 0xe4, 0x13, 0x68, 0x70, 0xdc, 0x92, 0x87,
+	0xa5, 0xce, 0x35, 0xb2, 0xa0, 0x27, 0xb0, 0xa9, 0xad, 0x33, 0xa7, 0xfc, 0x0f, 0x06, 0x1d, 0xa6,
+	0x2a, 0x4e, 0x86, 0x32, 0x78, 0xa3, 0xa2, 0x9b, 0xdf, 0x02, 0x1a, 0xb6, 0x96, 0xde, 0xc2, 0x97,
+	0x8b, 0x92, 0x88, 0x52, 0x6a, 0x9e, 0x22, 0xcc, 0x61, 0x5b, 0xd6, 0x61, 0x46, 0xca, 0x08, 0xd0,
+	0xaf, 0xa0, 0xa6, 0x39, 0xe4, 0x07, 0xd0, 0xd4, 0xbc, 0xbb, 0xcc, 0xf5, 0x86, 0x66, 0x74, 0x7d,
+	0xbc, 0x88, 0x89, 0x77, 0x67, 0xc5, 0xa0, 0x36, 0xf1, 0x10, 0x84, 0xd2, 0x2e, 0x6c, 0x9d, 0x7b,
+	0xd2, 0xbb, 0x61, 0xc9, 0x24, 0x10, 0x22, 0xe0, 0x88, 0x3a, 0x51, 0x55, 0x32, 0x0d, 0xd9, 0x9d,
+	0xd5, 0x43, 0x1a, 0xc8, 0x50, 0xad, 0x67, 0x65, 0x32, 0xfc, 0xad, 0xb4, 0xac, 0x4b, 0x90, 0xb3,
+	0xc5, 0x17, 0xf7, 0xd2, 0x72, 0x66, 0x49, 0xfc, 0x23, 0xbc, 0xbc, 0xbf, 0x57, 0xa1, 0xd6, 0x1b,
+	0xab, 0x26, 0xbf, 0x01, 0xe5, 0x6e, 0x96, 0x16, 0xfa, 0xad, 0xf4, 0xc6, 0xdd, 0xac, 0x39, 0xe1,
+	0x37, 0x36, 0x8f, 0x1b, 0x2f, 0x91, 0xd8, 0x20, 0x0c, 0x9a, 0xd6, 0xc9, 0xb1, 0xc0, 0xb5, 0xd0,
+	0xb6, 0x99, 0x17, 0x0c, 0xdf, 0x81, 0xfa, 0x40, 0x4e, 0x15, 0xe0, 0xd7, 0xbd, 0x29, 0x25, 0xb1,
+	0xed, 0x9d, 0x8c, 0x58, 0x27, 0xe1, 0xd3, 0x58, 0x35, 0xa4, 0x4a, 0x3f, 0xa3, 0x11, 0x81, 0x0f,
+	0xe4, 0xf4, 0x32, 0x88, 0xc6, 0x37, 0x2c, 0x11, 0x3c, 0x52, 0x0d, 0xa9, 0xd2, 0x9f, 0x67, 0xa2,
+	0x86, 0x81, 0x9c, 0xda, 0x80, 0x37, 0xa3, 0x31, 0x00, 0x03, 0xcc, 0x27, 0xa7, 0xa9, 0x9f, 0xb8,
+	0x22, 0xd0, 0x9a, 0x13, 0xdf, 0x4f, 0x98, 0x10, 0x0e, 0x68, 0x6b, 0x0c, 0xb9, 0xd0, 0x68, 0x5b,
+	0x4b, 0x8d, 0xd6, 0x6a, 0x8e, 0x6d, 0xfd, 0x3a, 0x0c, 0xa9, 0x76, 0xde, 0xb3, 0xe1, 0x18, 0x9b,
+	0x20, 0x73, 0xd6, 0xd5, 0xa2, 0xc5, 0x41, 0x5c, 0xae, 0x28, 0xa5, 0x78, 0x43, 0xe3, 0xf2, 0x8c,
+	0x81, 0x7a, 0x15, 0x71, 0x3a, 0x73, 0x36, 0xb5, 0x45, 0x86, 0xc4, 0xf9, 0xe2, 0x8a, 0xc9, 0x3f,
+	0x66, 0x18, 0xaf, 0xeb, 0x3b, 0xcf, 0x94, 0xf2, 0x45, 0xb6, 0x8a, 0xa4, 0xc9, 0x6c, 0x67, 0xcb,
+	0x44, 0x32, 0xcd, 0x74, 0x04, 0x17, 0x5e, 0x18, 0xaa, 0x61, 0x8d, 0xe8, 0xb5, 0x94, 0x56, 0x20,
+	0xc5, 0x53, 0x2b, 0xcf, 0xf5, 0x9d, 0x69, 0x0a, 0x6d, 0xfa, 0xcd, 0xd4, 0xe3, 0xbf, 0xfb, 0x43,
+	0xe0, 0x6c, 0x6b, 0x5f, 0x0d, 0x89, 0xf7, 0xd2, 0x1b, 0x4b, 0xa5, 0x5c, 0x35, 0x29, 0x67, 0x47,
+	0xdf, 0xcb, 0x1c, 0x13, 0x3d, 0xbe, 0xe4, 0x9e, 0xaf, 0xe3, 0xbf, 0xab, 0x24, 0x72, 0x06, 0x9e,
+	0xda, 0x67, 0x13, 0x2f, 0x19, 0x3b, 0x7b, 0xfa, 0xbd, 0x68, 0x8a, 0x1e, 0x98, 0xbc, 0x5c, 0x8d,
+	0x2f, 0xf6, 0x01, 0x06, 0x72, 0xea, 0xb3, 0xa8, 0x28, 0x7b, 0xa9, 0xb4, 0x56, 0xc5, 0x52, 0x6e,
+	0xdb, 0xb9, 0x52, 0x5e, 0xc8, 0x95, 0x0f, 0x00, 0x60, 0x88, 0x10, 0x2e, 0x92, 0xd8, 0x0c, 0xeb,
+	0x98, 0x75, 0x17, 0x49, 0x9c, 0x8d, 0x9c, 0x9a, 0xa0, 0xaf, 0x2d, 0x19, 0x05, 0x46, 0xaf, 0x45,
+	0x26, 0xa2, 0xbe, 0xd1, 0xe3, 0x6b, 0x71, 0x65, 0x95, 0x23, 0x4d, 0xbd, 0xfa, 0x17, 0xe0, 0xb4,
+	0x66, 0xca, 0x03, 0x39, 0x86, 0x7a, 0x87, 0x49, 0xd4, 0x43, 0xec, 0x7a, 0x6b, 0xfd, 0x29, 0x70,
+	0xf7, 0x96, 0xf8, 0x66, 0x1a, 0xfe, 0x35, 0xc0, 0x8d, 0x97, 0x08, 0xa6, 0x66, 0x64, 0x62, 0x8b,
+	0xd9, 0xc3, 0xb5, 0xeb, 0x2c, 0x2f, 0x18, 0x05, 0xaf, 0x61, 0x43, 0xd7, 0x65, 0x84, 0x05, 0x38,
+	0x43, 0x91, 0x67, 0xf6, 0xc4, 0x82, 0xb3, 0xa5, 0xbb, 0x5d, 0x30, 0x66, 0xa9, 0x5e, 0x71, 0xe2,
+	0xfb, 0xbd, 0xb1, 0x24, 0x76, 0xe1, 0xd6, 0x35, 0xc8, 0x5d, 0x62, 0x09, 0x72, 0x02, 0xeb, 0x98,
+	0x2d, 0xd9, 0x00, 0x31, 0x67, 0xad, 0x3d, 0xa5, 0xb8, 0x2b, 0x16, 0x04, 0xf9, 0x1a, 0xda, 0x1d,
+	0x26, 0xf3, 0x59, 0x7d, 0xaf, 0x18, 0x32, 0xce, 0x6b, 0x98, 0x43, 0x9d, 0xc7, 0x00, 0x1d, 0x26,
+	0x0d, 0x14, 0x23, 0x3b, 0x45, 0xf0, 0xec, 0xc1, 0x2d, 0x64, 0x0b, 0xf2, 0x05, 0x34, 0x3a, 0x4c,
+	0x62, 0xf9, 0x14, 0x64, 0xbb, 0x00, 0x50, 0x3d, 0xb8, 0x45, 0x5c, 0x44, 0xba, 0xed, 0x1b, 0x2e,
+	0x64, 0x0a, 0xb5, 0xe7, 0x2e, 0xd9, 0x1a, 0x2e, 0xdc, 0x62, 0x3e, 0xa2, 0x4a, 0xd3, 0x3a, 0xf3,
+	0xd0, 0xed, 0x2c, 0x45, 0x08, 0x9b, 0x96, 0x4b, 0x96, 0x03, 0x67, 0x3c, 0x36, 0x4f, 0x68, 0x6e,
+	0x63, 0xfe, 0xe8, 0xdc, 0x42, 0xb6, 0x20, 0xd7, 0xb0, 0xd5, 0x61, 0x72, 0xbe, 0x7d, 0x91, 0xfd,
+	0x47, 0x3a, 0xdb, 0x83, 0xfb, 0xd8, 0xaa, 0x20, 0xe7, 0xe0, 0x6a, 0x57, 0x16, 0x27, 0xdd, 0xf7,
+	0xca, 0xbc, 0xdf, 0xc3, 0x6e, 0xb1, 0x16, 0xf2, 0xd9, 0x13, 0xd3, 0x36, 0x7b, 0x70, 0x9f, 0x14,
+	0x11, 0x64, 0x02, 0x9f, 0xac, 0x84, 0x6d, 0xe4, 0x67, 0xd6, 0xfe, 0xc7, 0x50, 0xa1, 0xfb, 0x8e,
+	0x82, 0x98, 0xd5, 0x90, 0x03, 0x54, 0xe2, 0x2c, 0x6d, 0x33, 0xb8, 0xd5, 0x5d, 0xb5, 0x82, 0x19,
+	0xd2, 0xb6, 0x91, 0x5c, 0x41, 0x20, 0xdd, 0xa5, 0xbd, 0x39, 0xe8, 0xfb, 0x26, 0xdd, 0x6d, 0x20,
+	0xd6, 0xb2, 0x6c, 0x86, 0xee, 0xdc, 0xd5, 0x6b, 0x68, 0x05, 0x99, 0xf7, 0xf3, 0xbd, 0x2e, 0xf5,
+	0x38, 0x8d, 0x82, 0x2a, 0x84, 0x3b, 0xf3, 0xb7, 0x64, 0x6a, 0xa1, 0x5b, 0xc8, 0x16, 0xdf, 0xd5,
+	0xd4, 0x9f, 0xd6, 0xcf, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xa8, 0xad, 0xee, 0x7c, 0x15,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

transformclient/transform.go

@@ -14,50 +14,50 @@ import (
 )
 
 type (
-	BytesReq                     = transform.BytesReq
-	OptionCode                   = transform.OptionCode
-	CityMkReq                    = transform.CityMkReq
-	CityIdsRes                   = transform.CityIdsRes
-	StudentRes                   = transform.StudentRes
-	Empty                        = transform.Empty
-	OptionsetRes                 = transform.OptionsetRes
-	GetErpSchoolRes              = transform.GetErpSchoolRes
-	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
-	DataPermissionReq            = transform.DataPermissionReq
-	UserRequest                  = transform.UserRequest
+	TokenRequest                 = transform.TokenRequest
+	Active                       = transform.Active
+	Tag                          = transform.Tag
 	ExcelLogRes                  = transform.ExcelLogRes
-	CityIdsReq                   = transform.CityIdsReq
-	ErpUserRes                   = transform.ErpUserRes
-	TreeNode                     = transform.TreeNode
-	CityMkRes                    = transform.CityMkRes
+	GetErpRoleReq                = transform.GetErpRoleReq
+	DataPermissionReq            = transform.DataPermissionReq
 	MktRes                       = transform.MktRes
-	StudentReq                   = transform.StudentReq
-	UserResponse                 = transform.UserResponse
-	OptionsetReq                 = transform.OptionsetReq
-	GetErpActiveRes              = transform.GetErpActiveRes
-	Tag                          = transform.Tag
+	UserRequest                  = transform.UserRequest
+	Empty                        = transform.Empty
 	ResponseByte                 = transform.ResponseByte
 	ExcelLogReq                  = transform.ExcelLogReq
-	SchoolIdsReq                 = transform.SchoolIdsReq
 	SchoolIdsRes                 = transform.SchoolIdsRes
+	CityMkRes                    = transform.CityMkRes
+	GetErpActiveReq              = transform.GetErpActiveReq
 	TreeNodes                    = transform.TreeNodes
+	ErpMktNetWorkDetail          = transform.ErpMktNetWorkDetail
 	ErpMktNetWorkDetailRes       = transform.ErpMktNetWorkDetailRes
 	ErpMktNetWorkDetailReq       = transform.ErpMktNetWorkDetailReq
+	CityMkReq                    = transform.CityMkReq
+	CityIdsRes                   = transform.CityIdsRes
+	DataPermissionRes            = transform.DataPermissionRes
+	TreeNode                     = transform.TreeNode
 	GetErpRoleRes                = transform.GetErpRoleRes
-	GetErpRoleReq                = transform.GetErpRoleReq
-	GetErpActiveReq              = transform.GetErpActiveReq
+	GetErpSchoolRes              = transform.GetErpSchoolRes
+	GetErpActiveRes              = transform.GetErpActiveRes
+	ErpUserReq                   = transform.ErpUserReq
+	UserResponse                 = transform.UserResponse
+	OptionCode                   = transform.OptionCode
+	BytesReq                     = transform.BytesReq
 	BytesResp                    = transform.BytesResp
 	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
 	OrganSchool                  = transform.OrganSchool
-	Active                       = transform.Active
-	MktReq                       = transform.MktReq
-	TokenRequest                 = transform.TokenRequest
+	StudentReq                   = transform.StudentReq
+	ErpUserRes                   = transform.ErpUserRes
 	TokenResponse                = transform.TokenResponse
-	ErpMktNetWorkDetail          = transform.ErpMktNetWorkDetail
-	ErpUserReq                   = transform.ErpUserReq
-	Options                      = transform.Options
 	ListOfInt                    = transform.ListOfInt
-	DataPermissionRes            = transform.DataPermissionRes
+	StudentRes                   = transform.StudentRes
+	OptionsetReq                 = transform.OptionsetReq
+	OptionsetRes                 = transform.OptionsetRes
+	Options                      = transform.Options
+	SchoolIdsReq                 = transform.SchoolIdsReq
+	CityIdsReq                   = transform.CityIdsReq
+	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
+	MktReq                       = transform.MktReq
 
 	Transform interface {
 		GetUser(ctx context.Context, in *UserRequest) (*UserResponse, error)