Merge remote-tracking branch 'origin/master'

# Conflicts:
#	protos/stationLayoutGraphics.proto
This commit is contained in:
thesai 2024-02-20 09:21:39 +08:00
commit 55e58e0d18

View File

@ -26,9 +26,9 @@ message RtssGraphicStorage {
repeated AxleCountingSection axleCountingSections = 16;
repeated LogicSection logicSections = 17;
repeated StopPosition stopPositions = 18;
// repeated SpksSwitch spksSwitchs = 19;
// repeated EsbButton esbButtons = 20; //
// repeated GatedBox gateBoxs = 21; // //
repeated SpksSwitch spksSwitchs = 19;
repeated EsbButton esbButtons = 20; //
repeated GatedBox gateBoxs = 21; // //
repeated Transponder transponders = 22; //
repeated Slope slopes = 23; //
// repeated CalculateLink CalculateLink = 24; // link信息
@ -207,7 +207,7 @@ message Station {
// string kilometerCode = 5; //
KilometerSystem kilometerSystem = 6; //
// int32 index = 7;
// string refIbpMapCode = 8; // IBP地图Code
//string refIbpMapCode = 8; // IBP地图Code
string stationName = 9; //
string stationNameAcronym = 10; //
bool depots = 11; //