From cd08b456fea3c8eb3e84cfc605f3b75eabbce256 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Wed, 16 Dec 2020 11:24:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=99=E9=97=B4=E5=88=86=E5=89=B2?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/vo/client/map/newmap/MapStationSplitVO.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/club/joylink/rtss/vo/client/map/newmap/MapStationSplitVO.java b/src/main/java/club/joylink/rtss/vo/client/map/newmap/MapStationSplitVO.java
index d47eb7170..7326aafad 100644
--- a/src/main/java/club/joylink/rtss/vo/client/map/newmap/MapStationSplitVO.java
+++ b/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;
 }

From 99eab1c0d98577338291b3526ac048d87af9521f Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Wed, 16 Dec 2020 13:11:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../joylink/rtss/simulation/cbtc/ATS/data/SimulationLog.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/SimulationLog.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/SimulationLog.java
index bbcec0411..b4b6bb91f 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/SimulationLog.java
+++ b/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;