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

src/views/ecw/offer/all-routes-list.vue

@@ -23,7 +23,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('出货渠道')" prop="shippingChannel">
-          <el-select v-model="queryParams.shippingChannel" :placeholder="$t('请选择出货渠道')" clearable>
+          <el-select v-model="queryParams.channelId" :placeholder="$t('请选择出货渠道')" clearable>
             <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId"
                        :key="item.channelId"></el-option>
           </el-select>