Merge remote-tracking branch 'origin/test-training2' into test-training2

This commit is contained in:
joylink_zhangsai 2023-01-30 17:42:15 +08:00
commit 5337333402

View File

@ -212,21 +212,21 @@ public class StationDirection extends MayOutOfOrderDevice implements Cloneable {
* 2.高速铁路一般选择200km/h 客货共线铁路
* 根据文件确定
*/
private boolean allowOverrun;
private boolean allowOverrun = true;
/**
* 允许旅客列车
* 选择/两线多线区间根据行规
* 车运行分工选择
*/
private boolean travelTrain;
private boolean travelTrain = true;
/**
* 允许货物列车
* 选择/两线多线区间根据行规
* 车运行分工选择
*/
private boolean goodsTrain;
private boolean goodsTrain = true;
/***************************************** 车务终端管理出入口方向相关属性begin **********************************************/
// TODO: 待数据统一之后这个构造函数代码可删除 20220714
@ -493,6 +493,9 @@ public class StationDirection extends MayOutOfOrderDevice implements Cloneable {
this.assistTime = null;
this.changeDirectionTime = null;
this.prepareRunStatus = null;
this.allowOverrun = true;
this.travelTrain = true;
this.goodsTrain = true;
}
/**