Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/PayChannelController.class.php

@@ -969,7 +969,7 @@ class PayChannelController extends ThinkController
                 ->order('tab_game_supersign.id DESC')
                 ->count();
 
-            $field = "pay_price as cost,sum(pay_price) as pay_amount,pay_way";
+            $field = "sum(pay_price) as cost,sum(pay_price) as pay_amount,pay_way";
         } elseif($model == 'deposit') {
             $map['pay_source'] = 0;
             if ($map['pay_time']) {
@@ -1010,7 +1010,7 @@ class PayChannelController extends ThinkController
                 ->order('tab_deposit.id DESC')
                 ->count();
 
-            $field = "pay_amount as cost,sum(pay_amount) as pay_amount,pay_way";
+            $field = "sum(pay_amount) as cost,sum(pay_amount) as pay_amount,pay_way";
         }
 
         $sumAllData = M($model,'tab_')