Merge branch 'dev_zyx' into dev

Application/Admin/Controller/SpendCountSetController.class.php

@@ -591,7 +591,7 @@ class SpendCountSetController extends \Think\Controller
         $deposit = $this->getBalanceDeposit();
         $initdata["inside_cash_count"] = $initdata["inside_cash_count"]-0+$balance-0+$bind;
         $initdata["balance_coin_deposit"] = $deposit;
-        $initdata["all_count"] = $initdata["inside_cash_count"]-0+$initdata["balance_coin_count"]-0+$initdata["cash_count"]-0+$deposit;
+        $initdata["all_count"] = $initdata["inside_cash_count"]-0+$initdata["cash_count"]-0+$deposit;
         $initdata["count_date"] = $this->date;
         $initdata["create_time"] = $this->nowdata;
         M("spend_month_count","tab_")->add($initdata);

Application/Admin/View/Finance/index.html

@@ -139,7 +139,7 @@
 
           <th ><div class="tooltip">内充流水<span class="tooltiptext"><span style="margin-left: -10px">管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员）），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除</span></span></div></th>
 
-          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
+          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币收入+内充流水</span></span></div></th>
 
           <th >操作</th>
         </tr>