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

application/admin/controller/unishop/Order.php

@@ -527,7 +527,7 @@ class Order extends Backend
                     GROUP_CONCAT(unishop_order_product.title) as title,
                     o.total_price,
                     SUM(unishop_order_product.number) as number,
-                    o.createtime,
+                    FROM_UNIXTIME(o.createtime,\'%Y-%m-%d %H:%i:%S\')
                     o.remark')
             ->group("o.id")
             ->select();