diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index 33590a70..dfd024d2 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -565,7 +565,11 @@ class Order extends BaseController
         [$page,$limit] = $this->getPage();
         $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
         $list = $repository->getAllList($where, $page, $limit);
+<<<<<<< HEAD
         halt($list['list']->toArray());
+=======
+        halt($list);
+>>>>>>> 858b4a267df5a3394b1e8ff44515ae6ee4f09bf4
         foreach($list['list'] as &$item) {
             $userAddressCode = explode(',', $item['order']['user_address_code']);
             $area = Db::name('geo_area')->where('area_code', $userAddressCode[0])->value('area_name');