Merge branch 'dev_zyx' into dev

Application/Admin/View/Finance/gameFinance.html

@@ -129,11 +129,11 @@
 
           <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 ><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>