公会统计商户名称修改

Application/Admin/Controller/FinanceController.class.php

@@ -1056,7 +1056,7 @@ class FinanceController extends ThinkController
                 "cost"=>"订单金额",
                 "pay_amount"=>"实付金额",
                 "pay_way"=>"充值方式",
-                "merchant_name"=>"商户"
+                "merchant_name"=>"所属商户"
             );
             addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-游戏统计-订单查看-导出"]);
             data2csv($data,"游戏统计订单查看",$dcop);

Application/Admin/Controller/FinancePromoteController.class.php

@@ -842,7 +842,7 @@ class FinancePromoteController extends AdminController
                 "cost"=>"订单金额",
                 "pay_amount"=>"实付金额",
                 "pay_way"=>"充值方式",
-                "merchant_name"=>"商户",
+                "merchant_name"=>"所属商户",
             ));
         }
         $totalData = self::totalGameStatisticsData($map, false);

Application/Admin/View/Finance/gameStatisticsDetail.html

@@ -132,7 +132,7 @@
 
           <th >充值方式</th>
 
-          <th >商户</th>
+          <th >所属商户</th>
         </tr>
         </thead>
         <!-- 列表 -->

Application/Admin/View/FinancePromote/gameStatisticsDetail.html

@@ -187,7 +187,7 @@
 
           <th >充值方式</th>
 
-          <th >商户</th>
+          <th >所属商户</th>
         </tr>
         </thead>
         <!-- 列表 -->