Merge remote-tracking branch 'origin/release' into release

Application/Admin/View/Finance/gameStatistics.html

@@ -230,7 +230,7 @@
             </tr>
           </volist>
           <tr>
-            <td colspan="3" ><span>总计</span></td>
+            <td colspan="4" ><span>总计</span></td>
             <td ><span><if condition="$sumCash neq ''">{$sumCash}<else/>0</if></span></td>
             <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
             <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>