Merge branch 'master' of http://120.78.198.155:10080/zerp/admin_operation

src/views/orderList/index.vue

@@ -47,7 +47,6 @@
     </div>
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
       <el-table-column type="selection" />
-
       <el-table-column label="分发订单号" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.orderId }}</span>