Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx

 Conflicts:

	Application/Admin/View/Finance/index.html

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);