Merge branch 'rcs_master' into ctu_conveyor

zhang

1 天以前 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

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

@@ -20,6 +20,8 @@
    PROGRESS(4),
    COMPLETE(5),
    CANCEL(6),
    EXPIRED(2),
    FAILED(3),
    ;

    public int dataSort;