From deee3228dd9753360adc33341501cba99441b3ae Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 9 Nov 2020 14:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BB=9F=E8=AE=A1=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FinancePromoteController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 2ce12a647..dc8eb326d 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -842,6 +842,7 @@ class FinancePromoteController extends AdminController
                 "cost"=>"订单金额",
                 "pay_amount"=>"实付金额",
                 "pay_way"=>"充值方式",
+                "merchant_name"=>"商户",
             ));
         }
         $totalData = self::totalGameStatisticsData($map, false);