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

skyouc

5 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

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

@@ -18,6 +18,7 @@
    WAVE_EXCE_STATUS_DONE("4", "任务完成"),
    ;

    // 终止，     等待执行， 正在执行，执行完成
    WaveItemExceStatus(String val, String desc) {
        this.val = Short.parseShort(val);
        this.desc = desc;