From 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 21 八月 2019 11:27:58 +0800 Subject: [PATCH] SdkArg add default_operator --- .idea/workspace.xml | 34 ++-- protomsg.proto | 3 protomsg.pb.go | 367 +++++++++++++++++++++++++++++---------------------- 3 files changed, 228 insertions(+), 176 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b625e8f..9cbfeb1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -24,12 +24,12 @@ </usages-collector> <usages-collector id="statistics.file.extensions.edit"> <counts> - <entry key="proto" value="309" /> + <entry key="proto" value="352" /> </counts> </usages-collector> <usages-collector id="statistics.file.types.edit"> <counts> - <entry key="PROTO" value="309" /> + <entry key="PROTO" value="352" /> </counts> </usages-collector> <usages-collector id="statistics.lifecycle.project"> @@ -49,8 +49,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/protomsg.proto"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="281"> - <caret line="187" column="14" selection-start-line="187" selection-start-column="8" selection-end-line="187" selection-end-column="14" /> + <state relative-caret-position="319"> + <caret line="195" column="18" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" /> </state> </provider> </entry> @@ -81,8 +81,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/protomsg.pb.go"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="41515"> - <caret line="2192" column="13" selection-start-line="2192" selection-start-column="13" selection-end-line="2192" selection-end-column="13" /> + <state relative-caret-position="41667"> + <caret line="2200" column="13" selection-start-line="2200" selection-start-column="13" selection-end-line="2200" selection-end-column="13" /> <folding> <element signature="e#96#237#0" expanded="true" /> </folding> @@ -173,8 +173,8 @@ </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="-448" /> - <option name="y" value="37" /> + <option name="x" value="8" /> + <option name="y" value="83" /> <option name="width" value="1678" /> <option name="height" value="1047" /> </component> @@ -237,18 +237,18 @@ <workItem from="1564968876353" duration="2244000" /> <workItem from="1565313761365" duration="597000" /> <workItem from="1565337974976" duration="1231000" /> - <workItem from="1565955759598" duration="6515000" /> + <workItem from="1565955759598" duration="7348000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="35671000" /> + <option name="totallyTimeSpent" value="36504000" /> </component> <component name="ToolWindowManager"> - <frame x="-448" y="37" width="1678" height="1047" extended-state="0" /> + <frame x="8" y="83" width="1678" height="1047" extended-state="0" /> <editor active="true" /> <layout> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31211373" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31211373" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> @@ -263,7 +263,7 @@ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> - <window_info anchor="bottom" id="Terminal" order="8" visible="true" weight="0.3457207" /> + <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.30405405" /> <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> <window_info anchor="bottom" id="Version Control" order="10" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> @@ -310,8 +310,8 @@ </entry> <entry file="file://$PROJECT_DIR$/protomsg.pb.go"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="41515"> - <caret line="2192" column="13" selection-start-line="2192" selection-start-column="13" selection-end-line="2192" selection-end-column="13" /> + <state relative-caret-position="41667"> + <caret line="2200" column="13" selection-start-line="2200" selection-start-column="13" selection-end-line="2200" selection-end-column="13" /> <folding> <element signature="e#96#237#0" expanded="true" /> </folding> @@ -351,8 +351,8 @@ </entry> <entry file="file://$PROJECT_DIR$/protomsg.proto"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="281"> - <caret line="187" column="14" selection-start-line="187" selection-start-column="8" selection-end-line="187" selection-end-column="14" /> + <state relative-caret-position="319"> + <caret line="195" column="18" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" /> </state> </provider> </entry> diff --git a/protomsg.pb.go b/protomsg.pb.go index 62a1948..188bc89 100644 --- a/protomsg.pb.go +++ b/protomsg.pb.go @@ -1717,14 +1717,15 @@ //SdkArg struct type SdkArg struct { - Alias string `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` - Must bool `protobuf:"varint,4,opt,name=must,proto3" json:"must,omitempty"` - Unit string `protobuf:"bytes,5,opt,name=unit,proto3" json:"unit,omitempty"` - Range string `protobuf:"bytes,6,opt,name=range,proto3" json:"range,omitempty"` - DefaultValue string `protobuf:"bytes,7,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` - Sort int32 `protobuf:"varint,8,opt,name=sort,proto3" json:"sort,omitempty"` + Alias string `protobuf:"bytes,1,opt,name=alias,proto3" json:"alias,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` + Must bool `protobuf:"varint,4,opt,name=must,proto3" json:"must,omitempty"` + Unit string `protobuf:"bytes,5,opt,name=unit,proto3" json:"unit,omitempty"` + Range string `protobuf:"bytes,6,opt,name=range,proto3" json:"range,omitempty"` + DefaultValue string `protobuf:"bytes,7,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + DefaultOperator string `protobuf:"bytes,8,opt,name=default_operator,json=defaultOperator,proto3" json:"default_operator,omitempty"` + Sort int32 `protobuf:"varint,9,opt,name=sort,proto3" json:"sort,omitempty"` } func (m *SdkArg) Reset() { *m = SdkArg{} } @@ -1805,6 +1806,13 @@ func (m *SdkArg) GetDefaultValue() string { if m != nil { return m.DefaultValue + } + return "" +} + +func (m *SdkArg) GetDefaultOperator() string { + if m != nil { + return m.DefaultOperator } return "" } @@ -2766,157 +2774,158 @@ func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) } var fileDescriptor_32de24555f916688 = []byte{ - // 2388 bytes of a gzipped FileDescriptorProto + // 2406 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0xcd, 0x6e, 0x1c, 0xc7, - 0xf1, 0xe7, 0xec, 0xf7, 0xd4, 0x7e, 0x68, 0xd5, 0xd2, 0xdf, 0x1e, 0xcb, 0x7f, 0xd1, 0xd4, 0x44, - 0x86, 0x09, 0xc1, 0x56, 0x02, 0x4a, 0xa7, 0x1c, 0x02, 0xd0, 0x24, 0x15, 0x2c, 0xe0, 0x08, 0xcc, + 0xf1, 0xe7, 0xec, 0xf7, 0xd4, 0x7e, 0x68, 0x35, 0xd2, 0xdf, 0x1e, 0xcb, 0x7f, 0xd3, 0xd4, 0x44, + 0x86, 0x19, 0xc1, 0x56, 0x02, 0x4a, 0xa7, 0x1c, 0x02, 0xd0, 0x24, 0x15, 0x2c, 0xe0, 0x28, 0xcc, 0x90, 0x52, 0x6e, 0x19, 0xf4, 0xee, 0x34, 0x97, 0x03, 0x36, 0x67, 0x06, 0xdd, 0x33, 0xb4, 0x79, - 0xc8, 0x03, 0xe4, 0x94, 0xbc, 0x42, 0x1e, 0x24, 0x40, 0x90, 0x53, 0x0e, 0x39, 0xf8, 0x98, 0x9c, - 0x1c, 0x48, 0x40, 0x2e, 0x41, 0x1e, 0x21, 0x41, 0x50, 0xd5, 0x3d, 0x5f, 0x4b, 0xca, 0xd6, 0x69, - 0xbb, 0x7e, 0xd5, 0xdb, 0x5d, 0x5d, 0xdf, 0x35, 0x30, 0xcb, 0x54, 0x9a, 0xa7, 0x97, 0x7a, 0xfd, - 0x94, 0x16, 0x6c, 0x54, 0xd2, 0x0f, 0x60, 0xc9, 0xb5, 0x30, 0xa8, 0xff, 0x02, 0x7a, 0xfb, 0x4a, - 0x70, 0x36, 0x83, 0x4e, 0x1c, 0x79, 0xce, 0x8e, 0xb3, 0xdb, 0x0f, 0x3a, 0x71, 0xc4, 0x1e, 0xc0, - 0x28, 0xe3, 0x4a, 0x24, 0x79, 0x1c, 0x79, 0x1d, 0x42, 0x2b, 0x9a, 0x31, 0xe8, 0x25, 0xfc, 0x52, - 0x78, 0xdd, 0x1d, 0x67, 0xd7, 0x0d, 0x68, 0xed, 0xff, 0xb7, 0x0b, 0x83, 0x03, 0x7e, 0x29, 0x54, - 0xf3, 0x28, 0x97, 0x8e, 0x2a, 0xb7, 0x77, 0xea, 0xed, 0xec, 0x3e, 0xf4, 0xb9, 0x8c, 0xb9, 0xb6, - 0x67, 0x18, 0x82, 0x3d, 0x82, 0x89, 0x4e, 0x78, 0xa6, 0xcf, 0xd3, 0x3c, 0x2c, 0x94, 0xf4, 0x7a, - 0xc4, 0x1c, 0x97, 0xd8, 0x2b, 0x25, 0xf1, 0xb0, 0xfc, 0x3a, 0x13, 0x5e, 0x9f, 0x64, 0xa2, 0x35, - 0x62, 0x3c, 0x8a, 0x94, 0x37, 0x30, 0x17, 0xe0, 0x9a, 0x7d, 0x00, 0x03, 0xae, 0x04, 0x8f, 0x23, - 0x6f, 0x48, 0x3b, 0x2d, 0xc5, 0xfe, 0x1f, 0x5c, 0x99, 0x26, 0xeb, 0x38, 0x2f, 0x22, 0xe1, 0x8d, - 0x76, 0x9c, 0xdd, 0x4e, 0x50, 0x03, 0xf8, 0x6a, 0xc9, 0x73, 0xc3, 0x74, 0x89, 0x59, 0xd1, 0x78, - 0x8b, 0xca, 0x75, 0xe6, 0x81, 0xb9, 0x05, 0xd7, 0xf4, 0xd4, 0xcc, 0x1b, 0xdb, 0xa7, 0x66, 0xb8, - 0x27, 0x4b, 0x55, 0xee, 0x4d, 0x8c, 0x74, 0xb8, 0xc6, 0x33, 0x0b, 0x2d, 0x14, 0xa9, 0x60, 0x4a, - 0x3b, 0x2b, 0xda, 0x68, 0x59, 0xeb, 0xaf, 0x53, 0x15, 0x79, 0x33, 0xc3, 0x2b, 0x69, 0x54, 0xd1, - 0x52, 0xf1, 0x24, 0xf2, 0xee, 0x18, 0x15, 0x11, 0x81, 0xff, 0x50, 0x42, 0x0b, 0x75, 0x25, 0x22, - 0x6f, 0x6e, 0xfe, 0x51, 0xd2, 0xec, 0x21, 0x40, 0xac, 0x43, 0x55, 0x24, 0x49, 0x9c, 0xac, 0xbd, - 0xbb, 0x3b, 0xce, 0xee, 0x28, 0x70, 0x63, 0x1d, 0x18, 0x00, 0xd9, 0xaa, 0x48, 0x42, 0x91, 0xf0, - 0xa5, 0x14, 0x1e, 0x33, 0x6c, 0x55, 0x24, 0x47, 0x04, 0xb0, 0x8f, 0x60, 0x84, 0x6c, 0xd2, 0xee, - 0x3d, 0x92, 0x7f, 0xa8, 0x8a, 0xe4, 0x14, 0x15, 0xec, 0xc3, 0x14, 0x59, 0x74, 0x8d, 0x0a, 0xe3, - 0xc8, 0xbb, 0x6f, 0x0c, 0xa3, 0x8a, 0xe4, 0x84, 0xb0, 0x45, 0xe4, 0xaf, 0xe0, 0xae, 0xb1, 0xff, - 0x7e, 0x12, 0x9d, 0x72, 0x7d, 0xb1, 0x48, 0xce, 0x52, 0xb6, 0x0b, 0x83, 0x15, 0x81, 0xe4, 0x0e, - 0xe3, 0xbd, 0xf9, 0xd3, 0xca, 0x29, 0xcd, 0xe6, 0xc0, 0xf2, 0xd9, 0x63, 0xe8, 0xe7, 0x5c, 0x5f, - 0x68, 0xaf, 0xb3, 0xd3, 0xdd, 0x1d, 0xef, 0xcd, 0xea, 0x8d, 0x78, 0x58, 0x60, 0x98, 0xfe, 0x77, - 0x0e, 0xf4, 0x90, 0x46, 0xf3, 0x22, 0x52, 0xf9, 0x99, 0xa5, 0x50, 0x3d, 0xb8, 0x6a, 0xf8, 0x5b, - 0x45, 0xb3, 0x8f, 0xc1, 0x5d, 0x29, 0xc1, 0x73, 0x11, 0xf2, 0xdc, 0xfa, 0xdd, 0xc8, 0x00, 0xfb, - 0x79, 0x83, 0xb9, 0xbc, 0xb6, 0x7e, 0x67, 0x99, 0x5f, 0x5e, 0x23, 0xb3, 0xc8, 0x22, 0xfb, 0xcf, - 0xbe, 0xb5, 0x21, 0x01, 0xfb, 0x39, 0x8a, 0x62, 0x55, 0x3a, 0x20, 0x95, 0x5a, 0x0a, 0xf5, 0x19, - 0xeb, 0x90, 0x4b, 0xae, 0x2e, 0xc9, 0x07, 0x47, 0xc1, 0x30, 0xd6, 0xfb, 0x48, 0x22, 0x2b, 0x12, - 0x32, 0x3c, 0x93, 0x7c, 0x4d, 0x3e, 0x38, 0x0a, 0x86, 0x91, 0x90, 0x2f, 0x24, 0x5f, 0xfb, 0xa7, - 0x30, 0xc6, 0x07, 0x9e, 0x44, 0x46, 0x81, 0x3e, 0xf4, 0x50, 0x7e, 0xab, 0xbe, 0x4d, 0xad, 0x10, - 0x8f, 0x3d, 0x82, 0x9e, 0x8e, 0x2a, 0xcd, 0x4d, 0xeb, 0x3d, 0x27, 0xd1, 0x45, 0x40, 0x2c, 0xff, - 0xa7, 0x30, 0x40, 0xa2, 0x48, 0xd8, 0xff, 0xc1, 0x20, 0xce, 0x56, 0x61, 0xa5, 0xb8, 0x7e, 0x9c, - 0xad, 0x16, 0x11, 0x4a, 0xa4, 0xa3, 0x0b, 0x63, 0x7c, 0xa3, 0xb7, 0xa1, 0x8e, 0x2e, 0xd0, 0xf8, - 0xfe, 0x6b, 0x00, 0x2b, 0x11, 0xfe, 0xff, 0x7d, 0x04, 0x7a, 0xdc, 0x12, 0x68, 0xde, 0x16, 0xa8, - 0x48, 0xac, 0x4c, 0xff, 0xec, 0x00, 0x18, 0x27, 0x20, 0x8b, 0x6e, 0x66, 0x0d, 0x34, 0x08, 0x71, - 0x43, 0x9b, 0x81, 0xd0, 0x20, 0x04, 0x2c, 0x22, 0xf6, 0x21, 0x0c, 0xf1, 0x26, 0x64, 0x75, 0x6b, - 0xfb, 0x2f, 0x22, 0xf6, 0x05, 0xb8, 0x79, 0x7c, 0x29, 0x42, 0x55, 0x48, 0xe1, 0xf5, 0x36, 0xef, - 0x3f, 0xe4, 0xd7, 0x07, 0xb9, 0x0c, 0x46, 0xb8, 0x25, 0x28, 0xa4, 0xa0, 0x90, 0x10, 0x7c, 0x95, - 0x9b, 0xfd, 0xc6, 0xb2, 0x2e, 0x21, 0xc4, 0x7e, 0x04, 0x13, 0xc3, 0x8e, 0xc4, 0x55, 0xbc, 0x12, - 0x36, 0xc1, 0x8c, 0x09, 0x3b, 0x24, 0xa8, 0x65, 0xca, 0x61, 0xcb, 0x94, 0xec, 0x13, 0x18, 0x5b, - 0xaf, 0x69, 0x18, 0x1a, 0x0c, 0x44, 0x1b, 0x6a, 0xcf, 0x71, 0x5b, 0x9e, 0xc3, 0xa0, 0xa7, 0x31, - 0x8b, 0x80, 0xc9, 0x22, 0xb8, 0xc6, 0x17, 0xc7, 0x3a, 0x3c, 0x2b, 0xa4, 0xa4, 0x74, 0x33, 0x0a, - 0x06, 0xb1, 0x7e, 0x51, 0x48, 0xc9, 0x76, 0x60, 0x22, 0xe3, 0xe4, 0x22, 0x2c, 0xf5, 0x31, 0x21, - 0x19, 0x01, 0x31, 0x0a, 0xc3, 0xc8, 0xff, 0x25, 0xcc, 0xac, 0x9e, 0xe3, 0x4b, 0x81, 0x0f, 0x7d, - 0xaf, 0x0c, 0xfd, 0x71, 0x53, 0x93, 0x36, 0x5a, 0x4a, 0xbd, 0xf9, 0x2f, 0x61, 0x60, 0x74, 0xc9, - 0xe6, 0xd0, 0x8d, 0xf8, 0xb5, 0x2d, 0x1c, 0xb8, 0x64, 0x7b, 0x00, 0xe6, 0x8f, 0x3c, 0x59, 0x0b, - 0xeb, 0x03, 0xf7, 0x1a, 0x7e, 0x82, 0x67, 0x20, 0x2b, 0xa0, 0xf3, 0x69, 0xe9, 0x3f, 0x03, 0xb7, - 0xc2, 0x31, 0xf1, 0xe9, 0x9c, 0xab, 0xbc, 0xf4, 0x50, 0x22, 0xf0, 0x22, 0x91, 0x94, 0x9e, 0x80, - 0x4b, 0xff, 0x35, 0x0c, 0x8f, 0x53, 0x79, 0xbd, 0x4e, 0x93, 0xf7, 0x7a, 0xd0, 0x67, 0x30, 0xc8, - 0xd2, 0x38, 0xc9, 0xb1, 0xe6, 0xa0, 0x4c, 0x77, 0x6a, 0x99, 0x8e, 0x11, 0x0f, 0x2c, 0xdb, 0x5f, - 0x55, 0xfa, 0xe2, 0xfa, 0x62, 0x5f, 0xad, 0x75, 0xdb, 0x17, 0x9d, 0x0d, 0x5f, 0x7c, 0x0e, 0x2e, - 0xe9, 0x9e, 0xab, 0x75, 0xe9, 0xf2, 0x1f, 0xb6, 0xc3, 0xe2, 0xe7, 0x2a, 0x2d, 0x32, 0x3c, 0xc8, - 0x24, 0x23, 0x5c, 0xf9, 0x57, 0x30, 0x6d, 0xb1, 0x9a, 0x2e, 0xed, 0xb4, 0x5c, 0xfa, 0x39, 0x8c, - 0xd7, 0xb8, 0x8b, 0x2c, 0xa1, 0x6f, 0x2a, 0x94, 0x8e, 0x40, 0xab, 0x04, 0xb0, 0x2e, 0x97, 0xba, - 0xe1, 0x5b, 0xdd, 0xa6, 0x6f, 0xf9, 0x7f, 0x75, 0xc0, 0xad, 0xfe, 0x81, 0xde, 0x6b, 0xce, 0xae, - 0x6e, 0x1d, 0x12, 0xbd, 0xa0, 0x62, 0x62, 0x58, 0xb9, 0xf8, 0x26, 0xb7, 0x8a, 0x74, 0x09, 0x39, - 0x15, 0xdf, 0xe4, 0xe8, 0xdc, 0x94, 0xda, 0x42, 0x29, 0xae, 0x84, 0xa4, 0x4b, 0xfa, 0x01, 0x10, - 0xf4, 0x15, 0x22, 0x98, 0xd0, 0x8d, 0xc0, 0xbd, 0xcd, 0x84, 0x4e, 0xb2, 0x1a, 0x26, 0xe5, 0x1d, - 0x91, 0x87, 0x55, 0x49, 0xc7, 0xbc, 0x23, 0x72, 0x2a, 0x3a, 0x3f, 0x82, 0x69, 0x24, 0xce, 0x44, - 0xb2, 0x12, 0xa1, 0xce, 0x79, 0x5e, 0xa6, 0xd7, 0x89, 0x05, 0x4f, 0x10, 0xf3, 0xff, 0xd5, 0x81, - 0x5e, 0x70, 0x9b, 0x4b, 0x3f, 0x86, 0x99, 0x35, 0x59, 0xa9, 0x55, 0xf3, 0x84, 0xc9, 0xaa, 0x32, - 0xed, 0x62, 0x23, 0xc9, 0x74, 0x37, 0x0c, 0xfb, 0x10, 0x20, 0x33, 0xfe, 0x85, 0x5c, 0x53, 0x13, - 0x5c, 0x8b, 0x2c, 0x22, 0xcc, 0xa4, 0x98, 0x32, 0xe3, 0xc8, 0x0a, 0xde, 0xd7, 0x11, 0x1e, 0xe9, - 0xc3, 0x14, 0x61, 0xae, 0xd6, 0xa1, 0xe9, 0x70, 0x6c, 0xd2, 0xd0, 0x11, 0x1a, 0x7e, 0x9f, 0xfa, - 0x9c, 0x07, 0x30, 0x4a, 0x33, 0xa1, 0x78, 0x9e, 0x2a, 0x4a, 0x1a, 0x6e, 0x50, 0xd1, 0xf8, 0xec, - 0x72, 0x6d, 0xd4, 0x32, 0x32, 0x72, 0x97, 0x60, 0x59, 0x90, 0xcb, 0x4b, 0xae, 0xb8, 0x2c, 0x4c, - 0x02, 0xa9, 0x2e, 0x79, 0x8d, 0xd0, 0xad, 0x59, 0x84, 0x0a, 0xb9, 0x14, 0xe1, 0xd7, 0x71, 0x7e, - 0x1e, 0x66, 0x4a, 0xd8, 0xd6, 0x65, 0x8c, 0xe0, 0xaf, 0xe2, 0xfc, 0xfc, 0x58, 0xb5, 0x7d, 0x62, - 0xd2, 0xf2, 0x09, 0xff, 0x4f, 0x1d, 0xe8, 0x9e, 0x44, 0x37, 0x73, 0x75, 0x5d, 0x54, 0x3a, 0xef, - 0x2a, 0x2a, 0xdd, 0x56, 0x51, 0x29, 0x59, 0x14, 0xa4, 0xbd, 0x8a, 0xf5, 0x12, 0xe3, 0xf4, 0x31, - 0xf4, 0x28, 0x94, 0xfa, 0xb7, 0x54, 0x8f, 0x7d, 0xb5, 0x0e, 0x88, 0x8b, 0xaf, 0x8b, 0x57, 0x69, - 0x52, 0xf6, 0x7c, 0xb8, 0xc6, 0x14, 0x81, 0x5d, 0xa3, 0xd1, 0x28, 0x2e, 0xd1, 0x4b, 0x6d, 0x55, - 0xc7, 0x5c, 0x63, 0x55, 0x09, 0x06, 0xc2, 0x84, 0xd3, 0xc8, 0xd1, 0xb4, 0xc1, 0xa8, 0xd1, 0xe6, - 0x68, 0xda, 0xd0, 0xea, 0x0b, 0x60, 0xa3, 0x2f, 0xa8, 0x83, 0x6c, 0xbc, 0x59, 0xfa, 0xab, 0xa2, - 0x60, 0x5a, 0xc1, 0xaa, 0xbe, 0xa7, 0x55, 0x7d, 0x27, 0xb7, 0xb5, 0x7d, 0xcc, 0x62, 0x33, 0xe8, - 0xeb, 0x93, 0x3b, 0xad, 0x93, 0x7f, 0x42, 0x7a, 0xa3, 0x10, 0xb7, 0x69, 0xec, 0xfe, 0x46, 0x79, - 0x95, 0xe2, 0x44, 0xe4, 0x41, 0xb5, 0xcb, 0x2f, 0x00, 0x6a, 0x9c, 0x72, 0x6b, 0x54, 0x5f, 0x67, - 0x7d, 0xf6, 0x3e, 0x18, 0x8b, 0xb5, 0xcd, 0xf7, 0x59, 0x19, 0xc1, 0xe6, 0xa2, 0xbb, 0x37, 0x2e, - 0x2a, 0x83, 0xb8, 0xf4, 0xb4, 0x5e, 0xed, 0x69, 0xfe, 0x6f, 0x60, 0x58, 0xbe, 0x71, 0xd3, 0x5b, - 0x6e, 0x44, 0x48, 0xe7, 0xfb, 0x23, 0xa4, 0xbb, 0x11, 0x21, 0x37, 0x9c, 0xbf, 0x77, 0xc3, 0xf9, - 0xfd, 0x3f, 0x3a, 0xd4, 0xf1, 0xec, 0xab, 0x75, 0x3d, 0x6a, 0x38, 0xcd, 0x51, 0xe3, 0xb6, 0x0a, - 0x51, 0xce, 0x16, 0x76, 0xae, 0x29, 0x67, 0x8b, 0xcb, 0x42, 0x9b, 0xb7, 0x8d, 0x02, 0x5a, 0x23, - 0x56, 0x24, 0x71, 0xd9, 0x09, 0xd2, 0x1a, 0x6f, 0x31, 0x05, 0xcf, 0x38, 0xa4, 0x21, 0x6c, 0x0e, - 0xe3, 0x85, 0xcc, 0xad, 0xa8, 0xc6, 0x37, 0x27, 0x16, 0x6c, 0x07, 0xea, 0xa8, 0xa1, 0xbe, 0xdf, - 0x39, 0x70, 0xe7, 0x70, 0x79, 0x70, 0x8e, 0xa7, 0xfc, 0x42, 0x68, 0xcd, 0xd7, 0x82, 0x7d, 0x8e, - 0x2d, 0x32, 0xba, 0x04, 0x3e, 0x64, 0xb6, 0xf7, 0x41, 0xb3, 0xc8, 0x2c, 0xa5, 0x30, 0x9b, 0xa3, - 0xc0, 0x6c, 0xb2, 0x5a, 0xef, 0x54, 0x5a, 0x7f, 0x02, 0x03, 0xbe, 0xca, 0xe3, 0x34, 0xa1, 0xe7, - 0xcd, 0xf6, 0x58, 0xa3, 0x2d, 0x5a, 0xee, 0x13, 0x27, 0xb0, 0x3b, 0x28, 0xb8, 0x92, 0xb3, 0xd4, - 0x2a, 0x96, 0xd6, 0xfe, 0xbf, 0x1d, 0x98, 0x9a, 0xb2, 0xf8, 0xae, 0xa2, 0xfb, 0xbd, 0x1d, 0xdb, - 0x2d, 0x33, 0x23, 0xf3, 0x60, 0x68, 0xd3, 0x69, 0x99, 0x03, 0x2c, 0x89, 0x8d, 0x57, 0xae, 0xe2, - 0xf5, 0x5a, 0xa8, 0x50, 0xc6, 0x49, 0x59, 0x1a, 0xc6, 0x16, 0xfb, 0x2a, 0x4e, 0x04, 0xfb, 0x14, - 0x66, 0x51, 0xac, 0x04, 0x09, 0x6c, 0x36, 0x19, 0xcd, 0x4f, 0x2b, 0x94, 0xb6, 0x95, 0x36, 0x1d, - 0x36, 0x6c, 0x7a, 0xa3, 0xb2, 0x18, 0xcd, 0xb7, 0x2b, 0xcb, 0x1f, 0x1c, 0x98, 0xbe, 0x8e, 0x23, - 0x91, 0xe6, 0x3c, 0x13, 0xd4, 0x8b, 0x3f, 0x80, 0x91, 0xd0, 0x87, 0x3c, 0xe7, 0x55, 0xf8, 0x54, - 0x34, 0xf2, 0xca, 0xa7, 0xde, 0x78, 0x7a, 0x1d, 0xe3, 0xed, 0x5e, 0x15, 0xa3, 0xee, 0x72, 0xbd, - 0x30, 0xa5, 0xa5, 0x1b, 0x18, 0x02, 0x77, 0x53, 0x50, 0x9a, 0x04, 0xe8, 0x06, 0x96, 0xaa, 0x1e, - 0x32, 0xa8, 0x07, 0x5f, 0xff, 0x3f, 0x1d, 0x18, 0x1f, 0xa4, 0x97, 0x38, 0x98, 0x53, 0x0f, 0x41, - 0xd3, 0xcf, 0x52, 0x0a, 0xfc, 0xb7, 0x43, 0xff, 0xae, 0x68, 0xf6, 0x04, 0xe6, 0x2b, 0xb3, 0xf5, - 0xf4, 0x5c, 0x09, 0x7d, 0x9e, 0x4a, 0x23, 0x69, 0x27, 0xb8, 0x81, 0xb3, 0x1d, 0x18, 0x9f, 0xf1, - 0x95, 0x78, 0x21, 0x78, 0x5e, 0x28, 0x63, 0xb3, 0x49, 0xd0, 0x84, 0x50, 0x76, 0x33, 0xae, 0xf5, - 0xe8, 0x1a, 0x43, 0xe0, 0x70, 0x9d, 0x2b, 0x21, 0x5e, 0xa6, 0x91, 0x28, 0xc5, 0xaf, 0x01, 0x7a, - 0x01, 0x5f, 0x62, 0x41, 0xec, 0x92, 0x29, 0xf8, 0x52, 0xb3, 0x6d, 0x68, 0xf4, 0x0c, 0xde, 0x90, - 0x38, 0xcd, 0x2e, 0x62, 0x1b, 0x40, 0x0b, 0xae, 0x56, 0xe7, 0xa7, 0x26, 0x7f, 0x13, 0xbf, 0x46, - 0x90, 0x1f, 0x27, 0x59, 0x61, 0x22, 0xa9, 0x4c, 0xdf, 0x35, 0x82, 0xfc, 0x55, 0x2a, 0xa5, 0x71, - 0x08, 0x9b, 0xbf, 0x1b, 0x08, 0x69, 0x3b, 0x2d, 0xd4, 0xaa, 0xca, 0xe0, 0x86, 0x62, 0x8f, 0x61, - 0xca, 0x13, 0x2e, 0xaf, 0xcb, 0xf1, 0xd6, 0x56, 0xc2, 0x36, 0xe8, 0xff, 0x1a, 0x66, 0x27, 0xd1, - 0x85, 0xb5, 0xc0, 0x11, 0x5f, 0x9d, 0xdf, 0x88, 0x09, 0x0f, 0xbb, 0xba, 0xa5, 0x14, 0x55, 0x44, - 0x94, 0x24, 0xf3, 0x61, 0x62, 0xf5, 0x7e, 0xb2, 0x4a, 0xad, 0x92, 0x3b, 0x41, 0x0b, 0xf3, 0x03, - 0x98, 0xd7, 0xe7, 0x07, 0x42, 0x17, 0x32, 0x67, 0x3f, 0x83, 0xe9, 0xaa, 0x09, 0x90, 0xa1, 0xc7, - 0x7b, 0x5e, 0x2b, 0x3b, 0x37, 0x44, 0x0a, 0xda, 0xdb, 0xfd, 0xdf, 0x76, 0xc1, 0x3d, 0xba, 0x12, - 0x49, 0x7e, 0x5c, 0xe8, 0xf3, 0xf7, 0x6a, 0x9c, 0x1f, 0xda, 0x86, 0xde, 0x34, 0xe5, 0xc6, 0x87, - 0xa9, 0x77, 0x3f, 0xa1, 0xc6, 0xfc, 0x23, 0xa0, 0xb9, 0x20, 0xc4, 0xee, 0xdc, 0x86, 0x31, 0xd2, - 0x47, 0x09, 0x35, 0x61, 0xb1, 0x0e, 0x35, 0xcf, 0x63, 0x7d, 0x76, 0x1d, 0x72, 0x29, 0x29, 0x90, - 0x47, 0xc1, 0x24, 0xd6, 0x27, 0x06, 0xdc, 0x97, 0x12, 0xf3, 0x06, 0x35, 0x25, 0xd4, 0x68, 0x0e, - 0xec, 0x37, 0x8d, 0x42, 0x0a, 0xea, 0x33, 0xeb, 0x42, 0x38, 0x6c, 0x15, 0xc2, 0x8f, 0xc1, 0x35, - 0x63, 0x4f, 0xdd, 0x22, 0x8d, 0x68, 0xe6, 0xc1, 0x00, 0xff, 0x04, 0xc6, 0xc4, 0xb4, 0x63, 0x9b, - 0x5b, 0x8f, 0x44, 0x76, 0x6a, 0xfb, 0x31, 0x8c, 0xe2, 0x2c, 0xcc, 0x52, 0x95, 0x6b, 0x0f, 0x36, - 0xcb, 0x28, 0x2a, 0x66, 0x91, 0x1d, 0xa7, 0x2a, 0x0f, 0x86, 0x31, 0xfd, 0x6a, 0xf6, 0x29, 0xf4, - 0x0a, 0x25, 0xb5, 0x37, 0xde, 0x2c, 0x85, 0xb8, 0xf9, 0x95, 0x92, 0x01, 0xb1, 0xd9, 0x17, 0x65, - 0xc9, 0x9c, 0x6c, 0xce, 0x01, 0x95, 0xca, 0x1b, 0x85, 0xd3, 0xff, 0xce, 0x81, 0x69, 0x8b, 0x71, - 0xc3, 0x1e, 0xa8, 0xfb, 0x34, 0x8b, 0x57, 0xcd, 0xc9, 0xdc, 0x25, 0x84, 0x1e, 0x8a, 0x43, 0x1a, - 0xb1, 0xb9, 0x5a, 0x57, 0x43, 0x1a, 0x02, 0x58, 0xf8, 0x9a, 0x35, 0xb4, 0xf7, 0x43, 0x5d, 0x66, - 0xff, 0x96, 0x2e, 0x93, 0x3e, 0x18, 0x49, 0x61, 0x4b, 0xd7, 0xc0, 0x4e, 0xc7, 0x85, 0x14, 0x26, - 0xb6, 0x7c, 0x98, 0x0a, 0x14, 0x3e, 0xcc, 0x0a, 0x7d, 0x1e, 0xda, 0x2f, 0x6d, 0x6e, 0x30, 0x16, - 0xe5, 0x8b, 0x16, 0x91, 0xff, 0x0a, 0xa0, 0x56, 0x27, 0x8a, 0x5b, 0x7e, 0x43, 0xca, 0xca, 0x14, - 0x6a, 0x80, 0x45, 0xfd, 0xed, 0xac, 0xd3, 0xf8, 0x76, 0xf6, 0xae, 0x29, 0xe6, 0x19, 0x0c, 0xad, - 0xe2, 0xcb, 0xa6, 0xcf, 0xa9, 0x9b, 0xbe, 0x77, 0xf4, 0x4e, 0xfe, 0xdf, 0x1d, 0xb8, 0x77, 0xa4, - 0x8f, 0x85, 0xd2, 0x69, 0x72, 0xc0, 0x57, 0xe7, 0xb6, 0x62, 0xb2, 0xcf, 0x6d, 0x66, 0x35, 0x65, - 0xb5, 0x11, 0x48, 0x47, 0xba, 0xb1, 0x2d, 0xb2, 0xc5, 0xe3, 0x23, 0x9b, 0x63, 0x4d, 0x91, 0xeb, - 0x56, 0x21, 0x6d, 0xa6, 0x89, 0x8c, 0x4e, 0x6f, 0x4c, 0x13, 0x06, 0x58, 0x50, 0x26, 0x38, 0xb3, - 0xf9, 0xd4, 0x46, 0x89, 0x25, 0x1b, 0x95, 0xb9, 0xff, 0x83, 0x95, 0xb9, 0xfd, 0xb1, 0xa9, 0x5f, - 0xbe, 0xed, 0xc9, 0x9f, 0x1d, 0x98, 0x34, 0xbb, 0x00, 0x36, 0x81, 0xd1, 0x69, 0x68, 0xea, 0xf5, - 0x7c, 0x8b, 0xcd, 0x61, 0x52, 0x52, 0xd8, 0x7d, 0xce, 0x1d, 0x76, 0x1f, 0xe6, 0x4d, 0x04, 0xcb, - 0xc7, 0xbc, 0xc3, 0x00, 0x06, 0xa7, 0x21, 0xed, 0xe8, 0xb2, 0x29, 0xb8, 0x66, 0x7d, 0x12, 0x5d, - 0xcc, 0x7b, 0xec, 0x2e, 0x4c, 0x2b, 0x12, 0x5d, 0x75, 0xde, 0x67, 0x2e, 0xf4, 0x4f, 0x43, 0xe4, - 0x0e, 0xd8, 0x3d, 0xb8, 0x53, 0x1e, 0x67, 0xdb, 0x83, 0xf9, 0x90, 0xcd, 0x00, 0x4e, 0xc3, 0x53, - 0xfb, 0xcd, 0x60, 0x3e, 0x32, 0x32, 0x99, 0xe4, 0x39, 0x77, 0x8d, 0x4c, 0xc7, 0xa9, 0x94, 0x07, - 0x69, 0x72, 0x16, 0xaf, 0xe7, 0xf0, 0xe4, 0x29, 0x8c, 0xca, 0x07, 0xa3, 0x24, 0x8b, 0x44, 0x0b, - 0x95, 0xcf, 0xb7, 0x70, 0xfd, 0x8a, 0x3a, 0xf2, 0xb9, 0x83, 0xeb, 0x43, 0x21, 0x45, 0x2e, 0xe6, - 0x9d, 0x27, 0xcf, 0x61, 0xd6, 0x36, 0x91, 0x91, 0xf9, 0x70, 0x49, 0x9a, 0x98, 0x6f, 0x19, 0xa9, - 0x2c, 0x69, 0xec, 0x3e, 0x77, 0xbe, 0xf4, 0xfe, 0xf2, 0x66, 0xdb, 0xf9, 0xf6, 0xcd, 0xb6, 0xf3, - 0x8f, 0x37, 0xdb, 0xce, 0xef, 0xdf, 0x6e, 0x6f, 0x7d, 0xfb, 0x76, 0x7b, 0xeb, 0x6f, 0x6f, 0xb7, - 0xb7, 0x96, 0x03, 0xd2, 0xfb, 0xb3, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x12, 0xc7, 0xc1, 0xcb, - 0x3a, 0x17, 0x00, 0x00, + 0xc8, 0x03, 0xe4, 0x94, 0xbc, 0x42, 0xde, 0x24, 0xc8, 0x29, 0x87, 0x1c, 0x7c, 0x4c, 0x4e, 0x0e, + 0x24, 0x20, 0x08, 0x10, 0xe4, 0x11, 0x12, 0x04, 0x55, 0xdd, 0x3d, 0x1f, 0x4b, 0xca, 0xd6, 0x69, + 0xbb, 0x7e, 0x55, 0xdb, 0x5d, 0x5d, 0xdf, 0x3d, 0x30, 0xcb, 0x65, 0x56, 0x64, 0x97, 0x6a, 0xfd, + 0x84, 0x16, 0xde, 0xc8, 0xd2, 0x0f, 0x60, 0xc9, 0x14, 0xd7, 0x68, 0xf0, 0x1c, 0x7a, 0xfb, 0x92, + 0x33, 0x6f, 0x06, 0x9d, 0x24, 0xf6, 0x9d, 0x1d, 0x67, 0xb7, 0x1f, 0x76, 0x92, 0xd8, 0x7b, 0x00, + 0xa3, 0x9c, 0x49, 0x9e, 0x16, 0x49, 0xec, 0x77, 0x08, 0xad, 0x68, 0xcf, 0x83, 0x5e, 0xca, 0x2e, + 0xb9, 0xdf, 0xdd, 0x71, 0x76, 0xdd, 0x90, 0xd6, 0xc1, 0x7f, 0xbb, 0x30, 0x38, 0x60, 0x97, 0x5c, + 0x36, 0xb7, 0x72, 0x69, 0x2b, 0x2b, 0xde, 0xa9, 0xc5, 0xbd, 0xfb, 0xd0, 0x67, 0x22, 0x61, 0xca, + 0xec, 0xa1, 0x09, 0xef, 0x21, 0x4c, 0x54, 0xca, 0x72, 0x75, 0x9e, 0x15, 0x51, 0x29, 0x85, 0xdf, + 0x23, 0xe6, 0xd8, 0x62, 0x2f, 0xa5, 0xc0, 0xcd, 0x8a, 0xeb, 0x9c, 0xfb, 0x7d, 0xd2, 0x89, 0xd6, + 0x88, 0xb1, 0x38, 0x96, 0xfe, 0x40, 0x1f, 0x80, 0x6b, 0xef, 0x3d, 0x18, 0x30, 0xc9, 0x59, 0x12, + 0xfb, 0x43, 0x92, 0x34, 0x94, 0xf7, 0xff, 0xe0, 0x8a, 0x2c, 0x5d, 0x27, 0x45, 0x19, 0x73, 0x7f, + 0xb4, 0xe3, 0xec, 0x76, 0xc2, 0x1a, 0xc0, 0x5b, 0x0b, 0x56, 0x68, 0xa6, 0x4b, 0xcc, 0x8a, 0xc6, + 0x53, 0x64, 0xa1, 0x72, 0x1f, 0xf4, 0x29, 0xb8, 0xa6, 0xab, 0xe6, 0xfe, 0xd8, 0x5c, 0x35, 0x47, + 0x99, 0x3c, 0x93, 0x85, 0x3f, 0xd1, 0xda, 0xe1, 0x1a, 0xf7, 0x2c, 0x15, 0x97, 0x64, 0x82, 0x29, + 0x49, 0x56, 0xb4, 0xb6, 0xb2, 0x52, 0x5f, 0x65, 0x32, 0xf6, 0x67, 0x9a, 0x67, 0x69, 0x34, 0xd1, + 0x52, 0xb2, 0x34, 0xf6, 0xef, 0x68, 0x13, 0x11, 0x81, 0xff, 0x90, 0x5c, 0x71, 0x79, 0xc5, 0x63, + 0x7f, 0xae, 0xff, 0x61, 0x69, 0xef, 0x23, 0x80, 0x44, 0x45, 0xb2, 0x4c, 0xd3, 0x24, 0x5d, 0xfb, + 0x77, 0x77, 0x9c, 0xdd, 0x51, 0xe8, 0x26, 0x2a, 0xd4, 0x00, 0xb2, 0x65, 0x99, 0x46, 0x3c, 0x65, + 0x4b, 0xc1, 0x7d, 0x4f, 0xb3, 0x65, 0x99, 0x1e, 0x11, 0xe0, 0x7d, 0x00, 0x23, 0x64, 0x93, 0x75, + 0xef, 0x91, 0xfe, 0x43, 0x59, 0xa6, 0xa7, 0x68, 0xe0, 0x00, 0xa6, 0xc8, 0xa2, 0x63, 0x64, 0x94, + 0xc4, 0xfe, 0x7d, 0xed, 0x18, 0x59, 0xa6, 0x27, 0x84, 0x2d, 0xe2, 0x60, 0x05, 0x77, 0xb5, 0xff, + 0xf7, 0xd3, 0xf8, 0x94, 0xa9, 0x8b, 0x45, 0x7a, 0x96, 0x79, 0xbb, 0x30, 0x58, 0x11, 0x48, 0xe1, + 0x30, 0xde, 0x9b, 0x3f, 0xa9, 0x82, 0x52, 0x0b, 0x87, 0x86, 0xef, 0x3d, 0x82, 0x7e, 0xc1, 0xd4, + 0x85, 0xf2, 0x3b, 0x3b, 0xdd, 0xdd, 0xf1, 0xde, 0xac, 0x16, 0xc4, 0xcd, 0x42, 0xcd, 0x0c, 0xbe, + 0x75, 0xa0, 0x87, 0x34, 0xba, 0x17, 0x91, 0x2a, 0xce, 0x0c, 0x85, 0xe6, 0xc1, 0x55, 0x23, 0xde, + 0x2a, 0xda, 0xfb, 0x10, 0xdc, 0x95, 0xe4, 0xac, 0xe0, 0x11, 0x2b, 0x4c, 0xdc, 0x8d, 0x34, 0xb0, + 0x5f, 0x34, 0x98, 0xcb, 0x6b, 0x13, 0x77, 0x86, 0xf9, 0xc5, 0x35, 0x32, 0xcb, 0x3c, 0x36, 0xff, + 0xec, 0x1b, 0x1f, 0x12, 0xb0, 0x5f, 0xa0, 0x2a, 0xc6, 0xa4, 0x03, 0x32, 0xa9, 0xa1, 0xd0, 0x9e, + 0x89, 0x8a, 0x98, 0x60, 0xf2, 0x92, 0x62, 0x70, 0x14, 0x0e, 0x13, 0xb5, 0x8f, 0x24, 0xb2, 0x62, + 0x2e, 0xa2, 0x33, 0xc1, 0xd6, 0x14, 0x83, 0xa3, 0x70, 0x18, 0x73, 0xf1, 0x5c, 0xb0, 0x75, 0x70, + 0x0a, 0x63, 0xbc, 0xe0, 0x49, 0xac, 0x0d, 0x18, 0x40, 0x0f, 0xf5, 0x37, 0xe6, 0xdb, 0xb4, 0x0a, + 0xf1, 0xbc, 0x87, 0xd0, 0x53, 0x71, 0x65, 0xb9, 0x69, 0x2d, 0x73, 0x12, 0x5f, 0x84, 0xc4, 0x0a, + 0x7e, 0x02, 0x03, 0x24, 0xca, 0xd4, 0xfb, 0x3f, 0x18, 0x24, 0xf9, 0x2a, 0xaa, 0x0c, 0xd7, 0x4f, + 0xf2, 0xd5, 0x22, 0x46, 0x8d, 0x54, 0x7c, 0xa1, 0x9d, 0xaf, 0xed, 0x36, 0x54, 0xf1, 0x05, 0x3a, + 0x3f, 0x78, 0x05, 0x60, 0x34, 0xc2, 0xff, 0xbf, 0x8b, 0x42, 0x8f, 0x5a, 0x0a, 0xcd, 0xdb, 0x0a, + 0x95, 0xa9, 0xd1, 0xe9, 0x1f, 0x1d, 0x00, 0x1d, 0x04, 0xe4, 0xd1, 0xcd, 0xaa, 0x81, 0x0e, 0x21, + 0x6e, 0x64, 0x2a, 0x10, 0x3a, 0x84, 0x80, 0x45, 0xec, 0xbd, 0x0f, 0x43, 0x3c, 0x09, 0x59, 0xdd, + 0xda, 0xff, 0x8b, 0xd8, 0xfb, 0x1c, 0xdc, 0x22, 0xb9, 0xe4, 0x91, 0x2c, 0x05, 0xf7, 0x7b, 0x9b, + 0xe7, 0x1f, 0xb2, 0xeb, 0x83, 0x42, 0x84, 0x23, 0x14, 0x09, 0x4b, 0xc1, 0x29, 0x25, 0x38, 0x5b, + 0x15, 0x5a, 0x5e, 0x7b, 0xd6, 0x25, 0x84, 0xd8, 0x0f, 0x61, 0xa2, 0xd9, 0x31, 0xbf, 0x4a, 0x56, + 0xdc, 0x14, 0x98, 0x31, 0x61, 0x87, 0x04, 0xb5, 0x5c, 0x39, 0x6c, 0xb9, 0xd2, 0xfb, 0x18, 0xc6, + 0x26, 0x6a, 0x1a, 0x8e, 0x06, 0x0d, 0x91, 0x40, 0x1d, 0x39, 0x6e, 0x2b, 0x72, 0x3c, 0xe8, 0x29, + 0xac, 0x22, 0xa0, 0xab, 0x08, 0xae, 0xf1, 0xc6, 0x89, 0x8a, 0xce, 0x4a, 0x21, 0xa8, 0xdc, 0x8c, + 0xc2, 0x41, 0xa2, 0x9e, 0x97, 0x42, 0x78, 0x3b, 0x30, 0x11, 0x49, 0x7a, 0x11, 0x59, 0x7b, 0x4c, + 0x48, 0x47, 0x40, 0x8c, 0xd2, 0x30, 0x0e, 0x7e, 0x09, 0x33, 0x63, 0xe7, 0xe4, 0x92, 0xe3, 0x45, + 0xdf, 0xa9, 0x42, 0x7f, 0xd8, 0xb4, 0xa4, 0xc9, 0x16, 0x6b, 0xb7, 0xe0, 0x05, 0x0c, 0xb4, 0x2d, + 0xbd, 0x39, 0x74, 0x63, 0x76, 0x6d, 0x1a, 0x07, 0x2e, 0xbd, 0x3d, 0x00, 0xfd, 0x47, 0x96, 0xae, + 0xb9, 0x89, 0x81, 0x7b, 0x8d, 0x38, 0xc1, 0x3d, 0x90, 0x15, 0xd2, 0xfe, 0xb4, 0x0c, 0x9e, 0x82, + 0x5b, 0xe1, 0x58, 0xf8, 0x54, 0xc1, 0x64, 0x61, 0x23, 0x94, 0x08, 0x3c, 0x88, 0xa7, 0x36, 0x12, + 0x70, 0x19, 0xbc, 0x82, 0xe1, 0x71, 0x26, 0xae, 0xd7, 0x59, 0xfa, 0x4e, 0x17, 0xfa, 0x14, 0x06, + 0x79, 0x96, 0xa4, 0x05, 0xf6, 0x1c, 0xd4, 0xe9, 0x4e, 0xad, 0xd3, 0x31, 0xe2, 0xa1, 0x61, 0x07, + 0xab, 0xca, 0x5e, 0x4c, 0x5d, 0xec, 0xcb, 0xb5, 0x6a, 0xc7, 0xa2, 0xb3, 0x11, 0x8b, 0xcf, 0xc0, + 0x25, 0xdb, 0x33, 0xb9, 0xb6, 0x21, 0xff, 0x7e, 0x3b, 0x2d, 0x7e, 0x26, 0xb3, 0x32, 0xc7, 0x8d, + 0x74, 0x31, 0xc2, 0x55, 0x70, 0x05, 0xd3, 0x16, 0xab, 0x19, 0xd2, 0x4e, 0x2b, 0xa4, 0x9f, 0xc1, + 0x78, 0x8d, 0x52, 0xe4, 0x09, 0x75, 0xd3, 0xa0, 0xb4, 0x05, 0x7a, 0x25, 0x84, 0xb5, 0x5d, 0xaa, + 0x46, 0x6c, 0x75, 0x9b, 0xb1, 0x15, 0xfc, 0xc5, 0x01, 0xb7, 0xfa, 0x07, 0x46, 0xaf, 0xde, 0xbb, + 0x3a, 0x75, 0x48, 0xf4, 0x82, 0x9a, 0x89, 0x66, 0x15, 0xfc, 0xeb, 0xc2, 0x18, 0xd2, 0x25, 0xe4, + 0x94, 0x7f, 0x5d, 0x60, 0x70, 0x53, 0x69, 0x8b, 0x04, 0xbf, 0xe2, 0x82, 0x0e, 0xe9, 0x87, 0x40, + 0xd0, 0x97, 0x88, 0x60, 0x41, 0xd7, 0x0a, 0xf7, 0x36, 0x0b, 0x3a, 0xe9, 0xaa, 0x99, 0x54, 0x77, + 0x78, 0x11, 0x55, 0x2d, 0x1d, 0xeb, 0x0e, 0x2f, 0xa8, 0xe9, 0xfc, 0x00, 0xa6, 0x31, 0x3f, 0xe3, + 0xe9, 0x8a, 0x47, 0xaa, 0x60, 0x85, 0x2d, 0xaf, 0x13, 0x03, 0x9e, 0x20, 0x16, 0xfc, 0xab, 0x03, + 0xbd, 0xf0, 0xb6, 0x90, 0x7e, 0x04, 0x33, 0xe3, 0x32, 0x6b, 0x55, 0x7d, 0x85, 0xc9, 0xaa, 0x72, + 0xed, 0x62, 0xa3, 0xc8, 0x74, 0x37, 0x1c, 0xfb, 0x11, 0x40, 0xae, 0xe3, 0x0b, 0xb9, 0xba, 0x27, + 0xb8, 0x06, 0x59, 0xc4, 0x58, 0x49, 0xb1, 0x64, 0x26, 0xb1, 0x51, 0xbc, 0xaf, 0x62, 0xdc, 0x32, + 0x80, 0x29, 0xc2, 0x4c, 0xae, 0x23, 0x3d, 0xe1, 0x98, 0xa2, 0xa1, 0x62, 0x74, 0xfc, 0x3e, 0xcd, + 0x39, 0x0f, 0x60, 0x94, 0xe5, 0x5c, 0xb2, 0x22, 0x93, 0x54, 0x34, 0xdc, 0xb0, 0xa2, 0xf1, 0xda, + 0x76, 0xad, 0xcd, 0x32, 0xd2, 0x7a, 0x5b, 0xd0, 0x36, 0x64, 0x7b, 0xc8, 0x15, 0x13, 0xa5, 0x2e, + 0x20, 0xd5, 0x21, 0xaf, 0x10, 0xba, 0xb5, 0x8a, 0x50, 0x23, 0x17, 0x3c, 0xfa, 0x2a, 0x29, 0xce, + 0xa3, 0x5c, 0x72, 0x33, 0xba, 0x8c, 0x11, 0xfc, 0x55, 0x52, 0x9c, 0x1f, 0xcb, 0x76, 0x4c, 0x4c, + 0x5a, 0x31, 0x11, 0xfc, 0xb1, 0x03, 0xdd, 0x93, 0xf8, 0x66, 0xad, 0xae, 0x9b, 0x4a, 0xe7, 0x6d, + 0x4d, 0xa5, 0xdb, 0x6a, 0x2a, 0x96, 0x45, 0x49, 0xda, 0xab, 0x58, 0x2f, 0x30, 0x4f, 0x1f, 0x41, + 0x8f, 0x52, 0xa9, 0x7f, 0x4b, 0xf7, 0xd8, 0x97, 0xeb, 0x90, 0xb8, 0x78, 0xbb, 0x64, 0x95, 0xa5, + 0x76, 0xe6, 0xc3, 0x35, 0x96, 0x08, 0x9c, 0x1a, 0xb5, 0x45, 0x71, 0x89, 0x51, 0x6a, 0xba, 0x3a, + 0xd6, 0x1a, 0x63, 0x4a, 0xd0, 0x10, 0x16, 0x9c, 0x46, 0x8d, 0x26, 0x01, 0x6d, 0x46, 0x53, 0xa3, + 0x49, 0xa0, 0x35, 0x17, 0xc0, 0xc6, 0x5c, 0x50, 0x27, 0xd9, 0x78, 0xb3, 0xf5, 0x57, 0x4d, 0x41, + 0x8f, 0x82, 0x55, 0x7f, 0xcf, 0xaa, 0xfe, 0x4e, 0x61, 0x6b, 0xe6, 0x98, 0xc5, 0x66, 0xd2, 0xd7, + 0x3b, 0x77, 0x5a, 0x3b, 0xff, 0x98, 0xec, 0x46, 0x29, 0x6e, 0xca, 0xd8, 0xfd, 0x8d, 0xf6, 0x2a, + 0xf8, 0x09, 0x2f, 0xc2, 0x4a, 0x2a, 0x28, 0x01, 0x6a, 0x9c, 0x6a, 0x6b, 0x5c, 0x1f, 0x67, 0x62, + 0xf6, 0x3e, 0x68, 0x8f, 0xb5, 0xdd, 0xf7, 0xa9, 0xcd, 0x60, 0x7d, 0xd0, 0xdd, 0x1b, 0x07, 0xd9, + 0x24, 0xb6, 0x91, 0xd6, 0xab, 0x23, 0x2d, 0xf8, 0x0d, 0x0c, 0xed, 0x1d, 0x37, 0xa3, 0xe5, 0x46, + 0x86, 0x74, 0xbe, 0x3b, 0x43, 0xba, 0x1b, 0x19, 0x72, 0x23, 0xf8, 0x7b, 0x37, 0x82, 0x3f, 0xf8, + 0xa7, 0x43, 0x13, 0xcf, 0xbe, 0x5c, 0xd7, 0x4f, 0x0d, 0xa7, 0xf9, 0xd4, 0xb8, 0xad, 0x43, 0xd8, + 0xb7, 0x85, 0x79, 0xd7, 0xd8, 0xb7, 0xc5, 0x65, 0xa9, 0xf4, 0xdd, 0x46, 0x21, 0xad, 0x11, 0x2b, + 0xd3, 0xc4, 0x4e, 0x82, 0xb4, 0xc6, 0x53, 0x74, 0xc3, 0xd3, 0x01, 0xa9, 0x09, 0x53, 0xc3, 0x58, + 0x29, 0x0a, 0xa3, 0xaa, 0x8e, 0xcd, 0x89, 0x01, 0x75, 0xa2, 0xfe, 0x10, 0xe6, 0x56, 0xa8, 0xba, + 0xb3, 0x8e, 0xd4, 0x3b, 0x06, 0xff, 0x85, 0xbd, 0xba, 0xb5, 0xb4, 0xdb, 0xb0, 0xf4, 0xef, 0x1c, + 0xb8, 0x73, 0xb8, 0x3c, 0x38, 0xc7, 0x03, 0x7f, 0xce, 0x95, 0x62, 0x6b, 0xee, 0x7d, 0x86, 0xd3, + 0x34, 0x46, 0x0f, 0xde, 0x79, 0xb6, 0xf7, 0x5e, 0xb3, 0x1f, 0x2d, 0x05, 0xd7, 0xc2, 0x71, 0xa8, + 0x85, 0x8c, 0x83, 0x3a, 0x95, 0x83, 0x1e, 0xc3, 0x80, 0xad, 0x8a, 0x24, 0x4b, 0xc9, 0x12, 0xb3, + 0x3d, 0xaf, 0x31, 0x41, 0x2d, 0xf7, 0x89, 0x13, 0x1a, 0x09, 0xca, 0xc3, 0xf4, 0x2c, 0x33, 0x3e, + 0xa0, 0x75, 0xf0, 0x6f, 0x07, 0xa6, 0xba, 0x83, 0xbe, 0xad, 0x3f, 0x7f, 0xe7, 0x70, 0x77, 0xcb, + 0xf3, 0xd2, 0xf3, 0x61, 0x68, 0x2a, 0xaf, 0x2d, 0x17, 0x86, 0xc4, 0x19, 0xad, 0x90, 0xc9, 0x7a, + 0xcd, 0x65, 0x24, 0x92, 0xd4, 0x76, 0x91, 0xb1, 0xc1, 0xbe, 0x4c, 0x52, 0xee, 0x7d, 0x02, 0xb3, + 0x38, 0x91, 0x9c, 0x14, 0xd6, 0x42, 0xda, 0x49, 0xd3, 0x0a, 0x25, 0x31, 0xeb, 0xfe, 0x61, 0xc3, + 0xfd, 0x37, 0x9a, 0xd0, 0x88, 0x2c, 0xdf, 0x6e, 0x42, 0x7f, 0x70, 0x60, 0xfa, 0x2a, 0x89, 0x79, + 0x56, 0xb0, 0x9c, 0xd3, 0xd8, 0xfe, 0x00, 0x46, 0x5c, 0x1d, 0xb2, 0x82, 0x55, 0x99, 0x56, 0xd1, + 0xc8, 0xb3, 0x57, 0xbd, 0x71, 0xf5, 0xba, 0x1c, 0xb4, 0xc7, 0x5a, 0x4c, 0xd0, 0xcb, 0xf5, 0x42, + 0x77, 0xa1, 0x6e, 0xa8, 0x09, 0x94, 0xa6, 0xfc, 0xd5, 0xb5, 0xd2, 0x0d, 0x0d, 0x55, 0x5d, 0x64, + 0x50, 0xbf, 0x91, 0x83, 0xff, 0x74, 0x60, 0x7c, 0x90, 0x5d, 0xe2, 0x1b, 0x9e, 0xc6, 0x0d, 0x7a, + 0x28, 0x2d, 0x05, 0xc7, 0x7f, 0x3b, 0xf4, 0xef, 0x8a, 0xf6, 0x1e, 0xc3, 0x7c, 0xa5, 0x45, 0x4f, + 0xcf, 0x25, 0x57, 0xe7, 0x99, 0xd0, 0x9a, 0x76, 0xc2, 0x1b, 0xb8, 0xb7, 0x03, 0xe3, 0x33, 0xb6, + 0xe2, 0xcf, 0x39, 0x2b, 0x4a, 0xa9, 0x7d, 0x36, 0x09, 0x9b, 0x10, 0xea, 0xae, 0x5f, 0x76, 0x3d, + 0x3a, 0x46, 0x13, 0xf8, 0x0e, 0x2f, 0x24, 0xe7, 0x2f, 0xb2, 0x98, 0x5b, 0xf5, 0x6b, 0x80, 0x6e, + 0xc0, 0x96, 0xd8, 0x3b, 0xbb, 0xe4, 0x0a, 0xb6, 0x54, 0xde, 0x36, 0x34, 0xc6, 0x0b, 0x7f, 0x48, + 0x9c, 0xe6, 0xc0, 0xb1, 0x0d, 0xa0, 0x38, 0x93, 0xab, 0xf3, 0x53, 0x5d, 0xea, 0x89, 0x5f, 0x23, + 0xc8, 0x4f, 0xd2, 0xbc, 0xd4, 0x49, 0x67, 0x2b, 0x7d, 0x8d, 0x20, 0x7f, 0x95, 0x09, 0xa1, 0x03, + 0xc2, 0x94, 0xfa, 0x06, 0x42, 0xd6, 0xce, 0x4a, 0xb9, 0xaa, 0x8a, 0xbd, 0xa6, 0xbc, 0x47, 0x30, + 0x65, 0x29, 0x13, 0xd7, 0xf6, 0x25, 0x6c, 0x9a, 0x66, 0x1b, 0x0c, 0x7e, 0x0d, 0xb3, 0x93, 0xf8, + 0xc2, 0x78, 0xe0, 0x88, 0xad, 0xce, 0x6f, 0xe4, 0x84, 0x8f, 0x03, 0xe0, 0x52, 0xf0, 0x2a, 0x23, + 0x2c, 0xe9, 0x05, 0x30, 0x31, 0x76, 0x3f, 0x59, 0x65, 0xc6, 0xc8, 0x9d, 0xb0, 0x85, 0x05, 0x21, + 0xcc, 0xeb, 0xfd, 0x43, 0xae, 0x4a, 0x51, 0x78, 0x3f, 0x85, 0xe9, 0xaa, 0x09, 0x90, 0xa3, 0xc7, + 0x7b, 0x7e, 0xab, 0x90, 0x37, 0x54, 0x0a, 0xdb, 0xe2, 0xc1, 0x6f, 0xbb, 0xe0, 0x1e, 0x5d, 0xf1, + 0xb4, 0x38, 0x2e, 0xd5, 0xf9, 0x3b, 0xcd, 0xd8, 0x1f, 0x99, 0xd9, 0x5f, 0xcf, 0xef, 0x3a, 0x86, + 0x69, 0xcc, 0x3f, 0xa1, 0x19, 0xfe, 0x03, 0xa0, 0x27, 0x44, 0x84, 0x83, 0xbc, 0x49, 0x63, 0xa4, + 0x8f, 0x52, 0x9a, 0xd7, 0x12, 0x15, 0x29, 0x56, 0x24, 0xea, 0xec, 0x3a, 0x62, 0x42, 0x50, 0x22, + 0x8f, 0xc2, 0x49, 0xa2, 0x4e, 0x34, 0xb8, 0x2f, 0x04, 0xd6, 0x0d, 0x9a, 0x5f, 0x68, 0x26, 0x1d, + 0x98, 0xcf, 0x1f, 0xa5, 0xe0, 0x34, 0x92, 0xd6, 0x3d, 0x73, 0xd8, 0xea, 0x99, 0x1f, 0x82, 0xab, + 0x5f, 0x48, 0xf5, 0x34, 0x35, 0xa2, 0xe7, 0x11, 0x26, 0xf8, 0xc7, 0x30, 0x26, 0xa6, 0x79, 0xe1, + 0xb9, 0xf5, 0xeb, 0xc9, 0x3c, 0xf0, 0x7e, 0x04, 0xa3, 0x24, 0x8f, 0xf2, 0x4c, 0x16, 0xca, 0x87, + 0xcd, 0x8e, 0x8b, 0x86, 0x59, 0xe4, 0xc7, 0x99, 0x2c, 0xc2, 0x61, 0x42, 0xbf, 0xca, 0xfb, 0x04, + 0x7a, 0xa5, 0x14, 0xca, 0x1f, 0x6f, 0x76, 0x4d, 0x14, 0x7e, 0x29, 0x45, 0x48, 0x6c, 0xef, 0x73, + 0xdb, 0x5d, 0x27, 0x9b, 0x4f, 0x86, 0xca, 0xe4, 0x8d, 0x1e, 0x1b, 0x7c, 0xeb, 0xc0, 0xb4, 0xc5, + 0xb8, 0xe1, 0x0f, 0xb4, 0x7d, 0x96, 0x27, 0xab, 0xe6, 0x23, 0xde, 0x25, 0x84, 0x2e, 0x8a, 0xef, + 0x39, 0x62, 0x33, 0xb9, 0xae, 0xde, 0x73, 0x08, 0x60, 0x8f, 0x6c, 0xb6, 0xdb, 0xde, 0xf7, 0x0d, + 0xa4, 0xfd, 0x5b, 0x06, 0x52, 0xfa, 0xb6, 0x24, 0xb8, 0xe9, 0x72, 0x03, 0xf3, 0x90, 0x2e, 0x05, + 0xd7, 0xb9, 0x15, 0xc0, 0x94, 0xa3, 0xf2, 0x51, 0x5e, 0xaa, 0xf3, 0xc8, 0x7c, 0x94, 0x73, 0xc3, + 0x31, 0xb7, 0x37, 0x5a, 0xc4, 0xc1, 0x4b, 0x80, 0xda, 0x9c, 0xa8, 0xae, 0xfd, 0xdc, 0x94, 0xdb, + 0x12, 0xaa, 0x81, 0x45, 0xfd, 0x99, 0xad, 0xd3, 0xf8, 0xcc, 0xf6, 0xb6, 0x07, 0xcf, 0x53, 0x18, + 0x1a, 0xc3, 0xdb, 0xf9, 0xd0, 0xa9, 0xe7, 0xc3, 0xb7, 0x8c, 0x59, 0xc1, 0xdf, 0x1c, 0xb8, 0x77, + 0xa4, 0x8e, 0xb9, 0x54, 0x59, 0x7a, 0xc0, 0x56, 0xe7, 0xa6, 0x63, 0x7a, 0x9f, 0x99, 0xca, 0xaa, + 0xdb, 0x6a, 0x23, 0x91, 0x8e, 0x54, 0x43, 0x2c, 0x36, 0xcd, 0xe3, 0x03, 0x53, 0x63, 0x75, 0x93, + 0xeb, 0x56, 0x29, 0xad, 0x1f, 0x1e, 0x39, 0xed, 0xde, 0x78, 0x78, 0x68, 0x60, 0x41, 0x95, 0xe0, + 0xcc, 0xd4, 0x53, 0x93, 0x25, 0x86, 0x6c, 0x74, 0xe6, 0xfe, 0xf7, 0x76, 0xe6, 0xf6, 0x77, 0xa9, + 0xbe, 0xbd, 0xdb, 0xe3, 0x3f, 0x39, 0x30, 0x69, 0x4e, 0x01, 0xde, 0x04, 0x46, 0xa7, 0x91, 0xee, + 0xd7, 0xf3, 0x2d, 0x6f, 0x0e, 0x13, 0x4b, 0xe1, 0xa0, 0x3a, 0x77, 0xbc, 0xfb, 0x30, 0x6f, 0x22, + 0xd8, 0x3e, 0xe6, 0x1d, 0x0f, 0x60, 0x70, 0x1a, 0x91, 0x44, 0xd7, 0x9b, 0x82, 0xab, 0xd7, 0x27, + 0xf1, 0xc5, 0xbc, 0xe7, 0xdd, 0x85, 0x69, 0x45, 0x62, 0xa8, 0xce, 0xfb, 0x9e, 0x0b, 0xfd, 0xd3, + 0x08, 0xb9, 0x03, 0xef, 0x1e, 0xdc, 0xb1, 0xdb, 0x99, 0xf1, 0x60, 0x3e, 0xf4, 0x66, 0x00, 0xa7, + 0xd1, 0xa9, 0xf9, 0xbc, 0x30, 0x1f, 0x69, 0x9d, 0x74, 0xf1, 0x9c, 0xbb, 0x5a, 0xa7, 0xe3, 0x4c, + 0x88, 0x83, 0x2c, 0x3d, 0x4b, 0xd6, 0x73, 0x78, 0xfc, 0x04, 0x46, 0xf6, 0xc2, 0xa8, 0xc9, 0x22, + 0x55, 0x5c, 0x16, 0xf3, 0x2d, 0x5c, 0xbf, 0xa4, 0xe1, 0x7d, 0xee, 0xe0, 0xfa, 0x90, 0x0b, 0x5e, + 0xf0, 0x79, 0xe7, 0xf1, 0x33, 0x98, 0xb5, 0x5d, 0xa4, 0x75, 0x3e, 0x5c, 0x92, 0x25, 0xe6, 0x5b, + 0x5a, 0x2b, 0x43, 0x6a, 0xbf, 0xcf, 0x9d, 0x2f, 0xfc, 0x3f, 0xbf, 0xde, 0x76, 0xbe, 0x79, 0xbd, + 0xed, 0xfc, 0xfd, 0xf5, 0xb6, 0xf3, 0xfb, 0x37, 0xdb, 0x5b, 0xdf, 0xbc, 0xd9, 0xde, 0xfa, 0xeb, + 0x9b, 0xed, 0xad, 0xe5, 0x80, 0xec, 0xfe, 0xf4, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x4b, + 0x19, 0x2d, 0x65, 0x17, 0x00, 0x00, } func (m *Area) Marshal() (dAtA []byte, err error) { @@ -4116,8 +4125,14 @@ i = encodeVarintProtomsg(dAtA, i, uint64(len(m.DefaultValue))) i += copy(dAtA[i:], m.DefaultValue) } + if len(m.DefaultOperator) > 0 { + dAtA[i] = 0x42 + i++ + i = encodeVarintProtomsg(dAtA, i, uint64(len(m.DefaultOperator))) + i += copy(dAtA[i:], m.DefaultOperator) + } if m.Sort != 0 { - dAtA[i] = 0x40 + dAtA[i] = 0x48 i++ i = encodeVarintProtomsg(dAtA, i, uint64(m.Sort)) } @@ -5457,6 +5472,10 @@ n += 1 + l + sovProtomsg(uint64(l)) } l = len(m.DefaultValue) + if l > 0 { + n += 1 + l + sovProtomsg(uint64(l)) + } + l = len(m.DefaultOperator) if l > 0 { n += 1 + l + sovProtomsg(uint64(l)) } @@ -10243,6 +10262,38 @@ m.DefaultValue = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DefaultOperator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProtomsg + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthProtomsg + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProtomsg + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DefaultOperator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 9: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Sort", wireType) } diff --git a/protomsg.proto b/protomsg.proto index caa2b19..99cdcc3 100644 --- a/protomsg.proto +++ b/protomsg.proto @@ -193,7 +193,8 @@ string unit = 5;//鍗曚綅 string range = 6;//鍙傛暟鐨勮寖鍥� string default_value = 7;//鍙傛暟榛樿鍊� - int32 sort = 8;//鍙傛暟鎺掑簭 + string default_operator = 8;//鍙傛暟榛樿璁$畻绗﹀彿 + int32 sort = 9;//鍙傛暟鎺掑簭 } //TableChanged enum -- Gitblit v1.8.0