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

src/views/ecw/order/warehousing/index.vue

@@ -58,6 +58,7 @@
         v-slot="{row}"
         label="状态">
         <dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
+        <span class="red" v-show="row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}箱</span>
       </el-table-column>
       <el-table-column
         prop="address"