Merge branch 'rcs_master_path' into rcs_master

vincentlu

3 天以前 908421d77423a632630fccb49bf0eb2aa1431cd4

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

@@ -10,12 +10,12 @@

public enum StaStsType {

    IDLE,
    STOCK,
    PAKIN,
    PAKOUT,
    DISABLED,
    OTHER,
//    IDLE,
//    STOCK,
//    READY_RELEASE,
//    READY_TAKE,
//    DISABLED,
//    OTHER,
    ;

    StaStsType() {