Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev

zjj

2 天以前 ffbcb17a9ce705b443c3a450e3e3d56f13ee712f

 src/main/java/com/zy/common/model/enums/NavigationMapType.java

@@ -47,11 +47,11 @@
    }

    public static List<NavigationMapType> getDfxWithDevice() {
        return getMapTypes(DFX, SHUTTLE, LIFT, PATH_LOCK, TRAFFIC_CONTROL);
        return getMapTypes(DFX, SHUTTLE, LIFT);
    }

    public static List<NavigationMapType> getNormalWithDevice() {
        return getMapTypes(NORMAL, SHUTTLE, LIFT, PATH_LOCK, TRAFFIC_CONTROL);
        return getMapTypes(NORMAL, SHUTTLE, LIFT);
    }

    public static List<NavigationMapType> getMapTypes(NavigationMapType... types) {