Merge pull request 'feature/GamePaymentRule' (#689) from feature/GamePaymentRule into master

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

Application/Admin/Controller/PaymentMerchantController.class.php

@@ -76,6 +76,7 @@ class PaymentMerchantController extends ThinkController
                 'account' => $item['account'],
                 'status' => $item['status'],
                 'channel' => $item['channel'],
+                'is_master' => $item['is_master'],
                 'wayNames' => implode('、', $paymentMerchantService->getWaysName($item['ways'])),
                 'status_text' => $paymentMerchantService->getStatusText($item['status']),
                 'channel_text' => $paymentMerchantService->getChannelText($item['channel']),

Application/Admin/View/PaymentMerchant/list.html

@@ -187,6 +187,7 @@
                     <th>商户主体</th>
                     <th>支付商户</th>
                     <th>商户账户</th>
+                    <th>是否公户</th>
                     <th>支持支付方式</th>
                     <th>状态</th>
                     <th>操作管理员</th>
@@ -206,6 +207,7 @@
                             <td>{$data.main_name}</td>
                             <td>{$data.channel_text}</td>
                             <td>{$data.account}</td>
+                            <td><?=$data['is_master'] == 0 ? '否' : '是'?></td>
                             <td>{$data.wayNames}</td>
                             <td>
                                 <?php if($data['status'] == 0):?>