joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

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

Browse Source
This commit is contained in:
DU 2020-12-16 13:17:53 +08:00
commit 14fdf7cfb3
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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