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

skyouc

3 小时以前 6324285c0a898885b11fdbfb9ff3f4a911d7f587

 rsf-admin/src/i18n/en.js

@@ -332,6 +332,7 @@
                err: "error",
                result: "result",
                userId: "user",
                detail: "detail"
            },
            customer: {
                uuid: "uuid",
@@ -856,6 +857,7 @@
                groupQty: 'Group Qty',
                qty: "qty",
                orderNum: "orderNum",
                progress:"progress"
            },
            waveItem: {
                waveId: "waveId",