Merge branch 'yijia' of http://47.101.187.29:8081/loumengning/shop into yijia

application/admin/controller/unishop/Order.php

@@ -527,11 +527,12 @@ class Order extends Backend
                     GROUP_CONCAT(unishop_order_product.title) as title,
                     o.total_price,
                     SUM(unishop_order_product.number) as number,
+                    o.createtime,
                     o.remark')
             ->group("o.id")
             ->select();
         $list = collection($list)->toArray();
-        $title = ['工号','姓名','楼层','邮箱','商品','金额','购买数量','备注'];
+        $title = ['工号','姓名','楼层','邮箱','商品','金额','购买数量','下单时间','备注'];
         // Create new Spreadsheet object
         $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();