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

zjj

2 天以前 bed735aae42b6e0c75bf3fd63d9cd0996fba9355

 rsf-admin/src/i18n/en.js

@@ -209,10 +209,10 @@
        field: {
            outBound: {
                stockWithdrawal: 'StockWithdrawal',
                withdrawal:'Withdrawal'
                withdrawal: 'Withdrawal'
            },
            basContainer: {
                containerType:'containerType',
                containerType: 'containerType',
                codeType: 'codeType',
                areas: 'areas',
            },
@@ -228,8 +228,8 @@
                isWcs: 'isWcs',
                wcsData: 'wcsData',
                containerType: 'containerType',
                barcode: 'barcode',  
                autoTransfer: 'autoTransfer',          
                barcode: 'barcode',
                autoTransfer: 'autoTransfer',
            },
            host: {

@@ -1117,6 +1117,7 @@
        locInit: 'loc init',
        siteInit: 'site init',
        batch: 'batch',
        pick: 'Pick',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",