Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-03-19 ecb3045fb71d05b7ee3bf73fdf413f5091d65f65

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -23,6 +23,8 @@
        add:'Add',
        delete:'Delete',
        edit:'Edit',
        cancel:'cancel',
        restore:'restore',
        selectSame:'Select same',
        sameAfterwards:'Same afterwards',
        clearSelection:'Clear selection',
@@ -102,7 +104,8 @@
            importMaxCheckFailFirst:'Import ',
            importMaxCheckFailMid:' the data can not exceed ',
            importMaxCheckFailLast:' pieces, please import in multiple orders',
            updateAmountSuccessfully:'Updated amount successfully'
            updateAmountSuccessfully:'Updated amount successfully',
            updateOrderState:'Order status update succeeded',
        }

    },