From 0ba7d5d5bb55a6fbe7e8236c029a8bd7b790e697 Mon Sep 17 00:00:00 2001
From: chan <709206448@qq.com>
Date: Mon, 11 Dec 2023 18:02:36 +0800
Subject: [PATCH] debug

---
 app/controller/api/dataview/Order.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index dfd024d2..33590a70 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -565,11 +565,7 @@ 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');