Merge branch 'pre-production'

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -970,9 +970,9 @@ import { ElMessage } from 'element-plus'
       getDriverData() {
         return new Promise((rv, rev) => {
           getDriverList(1, 10, '').then(res => {
-            this.driverData = res.data.data.records;
+            this.driverData = res.data.data;
             console.log('===============>', res.data.data);
-            rv(res.data.data.records);
+            rv(res.data.data);
           });
         });
       },
@@ -1005,9 +1005,9 @@ import { ElMessage } from 'element-plus'
       getvehicleData() {
         return new Promise((rv, rev) => {
           getVehicleList(1, 10, '').then(res => {
-            this.vehicleData = res.data.data.records;
+            this.vehicleData = res.data.data;
             console.log('^^^^^^^^^^^^^^^^', res.data.data);
-            rv(res.data.data.records);
+            rv(res.data.data);
           });
         });
       },