diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 89f6425a1..30f5020f7 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/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); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index dc8eb326d..79cee5db9 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/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); diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index f322f2ce4..50991f100 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -132,7 +132,7 @@ 充值方式 - 商户 + 所属商户 diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index 42a4dcddc..f0a8dd153 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -187,7 +187,7 @@ 充值方式 - 商户 + 所属商户