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

zjj

2 天以前 4114759a57d73661937f28a765fb8a67c017b14b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java

@@ -14,6 +14,7 @@
    WAVE_ITEM_EXCE_STATUS_UN("0", "未执行"),
    WAVE_EXCE_STATUS_ING("1", "执行中"),
    WAVE_EXCE_STATUS_SEED("2", "已下发"),
    WAVE_ITEM_EXCE_PAUSE("4", "暂停"),
    WAVE_EXCE_STATUS_DONE("3", "下发完成"),
    ;