Merge branch 'feature/finance_statement_three' of wmtx/platform into release

优化汇总说明
4 years ago · 4813e28fec
parent ff1117c0b7 b899ff7af7
commit 4813e28fec
2 changed files with 3 additions and 3 deletions
--- a/Application/Admin/Controller/FinancialSummaryController.class.php
+++ b/Application/Admin/Controller/FinancialSummaryController.class.php
@ -3,7 +3,7 @@ namespace Admin\Controller;
 class FinancialSummaryController extends AdminController
 {
    public $keyname=array(
-       "cash_spend"=>"现金充值收入",
+       "cash_spend"=>"游戏现金充值收入",
        "balance_coin_spend"=>"平台币消耗",
        "balance_coin_income"=>"平台币充值收入",
        "game_supersign_income"=>"超级签购买收入",
--- a/Application/Admin/Model/PaymentMerchantModel.class.php
+++ b/Application/Admin/Model/PaymentMerchantModel.class.php
@ -13,8 +13,8 @@ class PaymentMerchantModel extends Model
        "4"=>"快捷支付"
    ];
    public $Channel=[
-        "1"=>"支付宝",
-        "2"=>"微信",
+        "1"=>"官方支付宝",
+        "2"=>"官方微信",
        "3"=>"易宝支付",
        "4"=>"双乾支付",
        "5"=>"汇付宝支付"