Merge pull request '优化' (#690) from feature/GamePaymentRule into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/690

Application/Admin/View/PaymentMerchant/form.html

@@ -134,7 +134,7 @@
               </td>
             </tr>
             <tr>
-              <td class="l noticeinfo"><i class="mustmark">*</i>是否公户</td>
+              <td class="l noticeinfo"><i class="mustmark">*</i>策略支付</td>
               <td class="r table_radio">
                 <span class="form_radio">
                     <label><input type="radio" name="is_master" value="0" <?php if(empty($record) || $record['is_master'] == 0):?>checked<?php endif;?>> 否</label>

Application/Admin/View/PaymentMerchant/list.html

@@ -187,7 +187,7 @@
                     <th>商户主体</th>
                     <th>支付商户</th>
                     <th>商户账户</th>
-                    <th>是否公户</th>
+                    <th>策略支付</th>
                     <th>支持支付方式</th>
                     <th>状态</th>
                     <th>操作管理员</th>

Application/Admin/View/PaymentMerchant/masterRules.html

@@ -84,7 +84,7 @@
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js"></script>
     <div class="cf clearfix main-place top_nav_list navtab_list">
-        <h3 class="page_title">游戏对公支付策略</h3>
+        <h3 class="page_title">支付商户支付策略</h3>
     </div>
     <div class="cf clearfix top_nav_list">
         <!-- 高级搜索 -->