Merge branch 'cjd' into dev

src/components/gitDeliverRecord/index.vue

@@ -18,7 +18,7 @@
         <el-form-item label="班级名称" label-width="100px">
           <el-input v-model="searchFrom.class_name" clearable></el-input>
         </el-form-item>
-        <el-form-item label="学员电话" label-width="100px">
+        <el-form-item label="电话号码" label-width="100px">
           <el-input v-model="searchFrom.mobile" clearable></el-input>
         </el-form-item>
         <el-form-item label="领取时间" label-width="100px">
@@ -55,9 +55,10 @@
         <el-table-column prop="class_name" label="班级名称"></el-table-column>
         <el-table-column prop="money" label="实付金额"></el-table-column>
         <el-table-column prop="teacher_name" label="带班老师"></el-table-column>
-        <el-table-column prop="nickname" label="学员名称"></el-table-column>
-        <el-table-column prop="mobile" label="学员电话"></el-table-column>
-        <el-table-column prop="address" label="学员地址"></el-table-column>
+        <el-table-column prop="user_id" label="UID"></el-table-column>
+        <el-table-column prop="nickname" label="客户名称"></el-table-column>
+        <el-table-column prop="mobile" label="收货人电话"></el-table-column>
+        <el-table-column prop="address" label="收货地址"></el-table-column>
         <el-table-column prop="created_at" label="领取时间"></el-table-column>
         <el-table-column prop="deliver_at" label="物流导入时间"></el-table-column>
         <el-table-column prop="express_no" label="快递单号"></el-table-column>