Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/SimulationLog.java

@@ -23,6 +23,7 @@ public class SimulationLog {
 
     private Event event;
 
+    @Getter
     public class Event {
         private EventType type;
 

src/main/java/club/joylink/rtss/vo/client/map/newmap/MapStationSplitVO.java

@@ -2,6 +2,7 @@ package club.joylink.rtss.vo.client.map.newmap;
 
 import club.joylink.rtss.vo.client.Point;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -38,4 +39,11 @@ public class MapStationSplitVO {
      */
     @NotNull
     private Point position;
+
+    /**
+     * 显示条件 01：现地&行调 / 02：行调 / 03：现地
+     */
+    @ApiModelProperty(value = "显示条件")
+    @NotBlank(message="显示条件不能为空")
+    private String showConditions;
 }