Merge remote-tracking branch 'origin/master'

Junjie

8 天以前 c319790d54867b63f27089b511d05076254e7990

 src/main/java/com/zy/core/task/MainProcessLane.java

@@ -10,6 +10,7 @@
    STATION_ENABLE_IN("station-enable-in-"),
    STATION_IN("station-in-"),
    STATION_OUT("station-out-"),
    STATION_OUT_PENDING_CONFIRM("station-out-pending-confirm-"),
    DUAL_STATION_OUT("dual-station-out-"),
    STATION_OUT_FINISH("station-out-finish-"),
    STATION_IN_ARRIVAL("station-in-arrival-"),
@@ -21,6 +22,7 @@
    FAKE_CRN_IO_FINISH("fake-crn-io-finish-"),
    FAKE_STATION_IN("fake-station-in-"),
    FAKE_STATION_OUT("fake-station-out-"),
    FAKE_STATION_OUT_PENDING_CONFIRM("fake-station-out-pending-confirm-"),
    FAKE_STATION_OUT_ORDER("fake-station-out-order-"),
    FAKE_STATION_RUN_BLOCK("fake-station-run-block-"),
    FAKE_DUAL_CRN_IO("fake-dual-crn-io-"),