Merge branch 'rcs_master' into ctu_conveyor

zhang

8 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/JamStateType.java

@@ -5,6 +5,7 @@
    RUNNING,
    FINISH,
    FAIL,
    DEPRECATED,
    ;

}