Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD
This commit is contained in:
commit
3ca9d88a1f
@ -10,7 +10,7 @@ message PslGraphicStorage {
|
|||||||
repeated PslButton pslButtons = 3;
|
repeated PslButton pslButtons = 3;
|
||||||
repeated PslKey pslKeys = 4;
|
repeated PslKey pslKeys = 4;
|
||||||
repeated PslText pslTexts = 5;
|
repeated PslText pslTexts = 5;
|
||||||
repeated GatedRelateDevice gatedRelateDeviceList = 6;
|
repeated graphicData.DeviceCombinationtype gatedRelateDeviceList = 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -51,10 +51,3 @@ message PslText {
|
|||||||
string color = 4;
|
string color = 4;
|
||||||
int32 fontSize = 5;
|
int32 fontSize = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 门控箱关联的设备列表 */
|
|
||||||
message GatedRelateDevice {
|
|
||||||
string code = 1;//设备编号
|
|
||||||
repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型
|
|
||||||
graphicData.RelatedRef.DeviceType deviceType = 3;//设备类型
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user