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

zjj

2 天以前 bed735aae42b6e0c75bf3fd63d9cd0996fba9355

 rsf-admin/src/i18n/en.js

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