merge

protos/stationLayoutGraphics.proto

@@ -30,6 +30,7 @@ message RtssGraphicStorage {
   repeated Transponder transponders = 22;        // 应答器
   repeated Slope slopes = 23;                    // 坡度
   repeated CalculateLink CalculateLink = 24;     // 计算link信息
+  repeated SlopeKiloMarker slopeKiloMarker = 25; //坡度公里标
 }
 
 message Canvas {
@@ -133,20 +134,12 @@ message TrainWindow {
 
 message AxleCounting {
   CommonInfo common = 1;
-<<<<<<< HEAD
-  string code = 2;                     // 名称
-  KilometerSystem kilometerSystem = 3; //公里标
-  repeated RelatedRef axleCountingRef =
-      4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
-  int32 index = 5; //计轴的索引编号
-=======
   string code = 2;                     // 名称
   KilometerSystem kilometerSystem = 3; //公里标
   repeated RelatedRef axleCountingRef =
       4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
   int32 index = 5; //计轴的索引编号
   bool invent = 6; //是否虚拟计轴--一般是最末端
->>>>>>> e44a7efaa57d4923f00deec4716380897047b243
 }
 
 // message Train {