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

zhou zhou

18 小时以前 757a5a1373c96d216be9eb5d6b5cd6374ce95deb

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java

@@ -162,6 +162,10 @@
                return "待入库";
            case  1:
                return " 入库中";
            case 2:
                return "任务执行中";
            case 3:
                return "任务完成";
            default:
                return String.valueOf(this.ioStatus);
        }