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

lbq

4 天以前 11db152ac1ee3d47e1047fb0c96fc7e10da345ac

 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;