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

zhangc

7 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

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

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

}