Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/financial/voucher.vue

@@ -68,7 +68,7 @@
             <el-input
               style="max-width: 188px"
               v-model="queryParams.numberNo"
-              :placeholder="$t('请输入订单号和提单号、自编号')"
+              :placeholder="$t('订单号和提单号,自编号')"
               clearable
               @keyup.enter.native="handleQuery"
             />