From bbd8ba53bce189ccc6d60482509be789f7b72abe Mon Sep 17 00:00:00 2001
From: hawind <fvzone@qq.com>
Date: Sat, 20 Mar 2021 05:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B5=A0=E5=93=81=E4=BF=83?=
 =?UTF-8?q?=E9=94=80=E5=B8=A6=E5=85=A5=E8=AE=A2=E5=8D=95=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Gdoo/Promotion/Controllers/PromotionController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Gdoo/Promotion/Controllers/PromotionController.php b/app/Gdoo/Promotion/Controllers/PromotionController.php
index 4d7b8a7e..a2e012ac 100644
--- a/app/Gdoo/Promotion/Controllers/PromotionController.php
+++ b/app/Gdoo/Promotion/Controllers/PromotionController.php
@@ -229,6 +229,7 @@ class PromotionController extends WorkflowController
                     }
                     return $row;
                 });
+                return $rows;
 
             } else {
  
@@ -309,8 +310,8 @@ class PromotionController extends WorkflowController
                     }
                     return $row;
                 });
+                return ['data' => $rows];
             }
-            return $this->json($rows, true);
         }
 
         return $this->render([