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

zjj

2 天以前 bed735aae42b6e0c75bf3fd63d9cd0996fba9355

 rsf-admin/src/i18n/zh.js

@@ -1116,6 +1116,7 @@
        continue: '继续收货',
        batch: '批量操作',
        confirm: '确认',
        pick: '拣料',
        bulkExport: "批量导出",
        selectSite: '选择站点',
        confirmSelect: '确认选择',