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

src/views/ecw/order/detail.vue

@@ -101,7 +101,7 @@
         </el-descriptions-item>
         <el-descriptions-item :label="$t('集运仓库')">
           {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}
-          <template v-for="(item, index) in order.externalWarehouseDtoList" >
+          <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
             <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
               {{$t('装柜时间')}}： {{item.estLoadingTime}}
               {{$t('装柜地址')}}：{{item.loadingAddress}}