From f99887e2b0ee24c87f4f1e51179246d9e340e5b3 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Tue, 15 Nov 2022 23:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/PaymentMerchant/list.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Application/Admin/View/PaymentMerchant/list.html b/Application/Admin/View/PaymentMerchant/list.html
index 4ed0f859e..fa8afb864 100644
--- a/Application/Admin/View/PaymentMerchant/list.html
+++ b/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):?>