Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

19 小时以前 1de6b39bfe3967916dcab8122be0d69fbaba8cca

 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);
        }