Merge branch 'dev_zyx' into dev

Application/Admin/View/Finance/index.html

@@ -177,9 +177,9 @@
           <tr>
             <td><span>总计</span></td>
             <td ><span><if condition="$sumData.cash_count neq ''">{$sumData.cash_count}<else/>0</if></span></td>
-            <td><if condition="$sumData.balance_coin_count neq ''">{$sumData.balance_coin_count}<else/>0</if></td>
             <td><if condition="$sumData.balance_coin_count neq ''">{$sumData.balance_coin_deposit}<else/>0</if></td>
             <td><if condition="$sumData.inside_cash_count neq ''">{$sumData.inside_cash_count}<else/>0</if></td>
+            <td><if condition="$sumData.balance_coin_count neq ''">{$sumData.balance_coin_count}<else/>0</if></td>
             <td><if condition="$sumData.all_count neq ''">{$sumData.all_count}<else/>0</if></td>
             <td>
               <a href="{:U('Finance/gameFinance',array('sign'=>1,'game_id'=>$_GET['game_id'],'count_date'=>$_GET['count_date'],'partner_id'=>$_GET['partner_id'],'from'=>'index'))}" >游戏查看</a>