From 44b0b351e0f117eebb4740e012e15a2416dbcc99 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 25 May 2023 16:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2where=E8=AF=AD=E5=8F=A5=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/FinancialRecord.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/system/merchant/FinancialRecord.php b/app/controller/admin/system/merchant/FinancialRecord.php
index c8222cac..72cf73e6 100644
--- a/app/controller/admin/system/merchant/FinancialRecord.php
+++ b/app/controller/admin/system/merchant/FinancialRecord.php
@@ -37,9 +37,9 @@ class FinancialRecord extends BaseController
         $merId = $this->request->merId();
         if ($merId) {
             $where['mer_id'] = $merId;
-            $where['financial_type'] = ['order', 'mer_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon' ,'auto_margin'];
+            $where['financial_type'] = ['order', 'mer_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon'];
         } else {
-            $where['financial_type'] = ['order', 'sys_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon', 'auto_margin'];
+            $where['financial_type'] = ['order', 'sys_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon',];
         }
         return app('json')->success($this->repository->getList($where, $page, $limit));
     }