Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementRecord.vue

@@ -176,6 +176,10 @@
 					</el-table-column>
 					<el-table-column prop="wingNumberOther" label="车厢号-2">
 					</el-table-column>
+					<el-table-column prop="shipNumber" label="航次">
+					</el-table-column>
+					<el-table-column prop="shipName" label="船名">
+					</el-table-column>
 					<el-table-column prop="agent" label="经办人">
 					</el-table-column>
 					<el-table-column prop="backOffice" label="操作人" width="120px">