Merge branch 'zjl_export_20191209'

app/Model/OrderModel.php

@@ -448,7 +448,7 @@ class OrderModel extends Model
                 $tmp[$i]['self_supplier_type'] = $self_supplier_type[$order[$i]['self_supplier_type']]; // 自采标记
                 $tmp[$i]['self_supplier_type'] = $self_supplier_type[$order[$i]['self_supplier_type']]; // 自采标记
                 $tmp[$i]['sample_demand_desc'] = $order[$i]['sample_demand_desc']; // 样片项目需求描述
                 $tmp[$i]['sample_demand_desc'] = $order[$i]['sample_demand_desc']; // 样片项目需求描述
                 //收货地址的电话
                 //收货地址的电话
-                $tmp[$i]['receiving_address']  = isset($current_order_addr['address_mobile']) ? $current_order_addr['address_mobile'] : '';
+                $tmp[$i]['receiving_address']  = isset($current_order_addr['mobile']) ? $current_order_addr['mobile'] : '';
             } else {
             } else {
                 $tmp[$i]['is_new_order'] = $order[$i]['is_new_order'] == 1 ? '是' : '否'; // 是否为新订单
                 $tmp[$i]['is_new_order'] = $order[$i]['is_new_order'] == 1 ? '是' : '否'; // 是否为新订单
             }       
             }