Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

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

@@ -226,10 +226,10 @@
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isCargoControl" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('订单状态')" align="center" prop="orderExceptionAmount" >
-        <template slot-scope="scope">
+      <el-table-column :label="$t('订单状态')" align="center" prop="statusMsg" >
+<!--        <template slot-scope="scope">
             <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.orderStatus" />
-          </template>
+          </template> -->
         </el-table-column>
       <el-table-column :label="$t('异常状态')" align="center">
         <template slot-scope="scope">