Merge branch 'feature/Feature-copy' into develop

src/views/supply/pickup/pickup_list.vue

@@ -300,6 +300,28 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
+              align="left"
+              label="提货人姓名"
+              prop="takerName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="提货人电话"
+              prop="takerPhone"
+              min-width="150"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="提货物流"
+              prop="pickLogistics"
+              min-width="200"
+              show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column
               align="center"
               label="操作"
               width="100"