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

zhangc

8 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

 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;