Commit bfa31ca8 by 朱继来

Merge branch 'zjl_export_20181030' into development

parents 397fdc81 96dc5278
Showing with 1 additions and 1 deletions
......@@ -280,7 +280,7 @@ class OrderModel extends Model
$tmp[$i]['order_id'] = $order[$i]['order_id'];
$tmp[$i]['order_sn'] = "\t".$order[$i]['order_sn']."\t";
$tmp[$i]['user_account'] = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
$tmp[$i]['is_new'] = $order[$i]['is_new'] != '' ? $user_tags[$order[$i]['is_new']] : '';
$tmp[$i]['is_new'] = isset($order[$i]['is_new']) ? $user_tags[$order[$i]['is_new']] : '';
$tmp[$i]['consignee'] = isset($order[$i]['consignee']) ? $order[$i]['consignee'] : '';
$tmp[$i]['create_time_date'] = date('Y-m-d', $order[$i]['create_time']);
$tmp[$i]['create_time_sec'] = date('H:i:s', $order[$i]['create_time']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment