Merge branch 'zjl_export_20191209'

app/Model/OrderModel.php

@@ -451,9 +451,7 @@ class OrderModel extends Model
                 $tmp[$i]['receiving_address']  = isset($current_order_addr['mobile']) ? $current_order_addr['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 ? '是' : '否'; // 是否为新订单
-            }       
-
-            unset($sales);     
+            }            
         }
         }
 
 
         return $tmp;
         return $tmp;