From 0dabcb3b10ea913316c52c17e03b1ae016f4589b Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 3 Apr 2024 16:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E4=B9=B0=E5=8D=95=20-=20=E5=95=86=E6=88=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/Merchant.php | 1 +
 runtime/swoole.pid                                | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 runtime/swoole.pid

diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index 2fed486..1cc262f 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -207,6 +207,7 @@ class Merchant extends BaseController
             ['mer_integral_platform_rate',0],
             ['mer_integral_merchant_rate',0],
             ['platform_commission',0],
+            ['is_online_payment',0],
             ['avg_consumption',0],
             'mer_label',
             'spread_uid'
diff --git a/runtime/swoole.pid b/runtime/swoole.pid
new file mode 100644
index 0000000..ff94f9e
--- /dev/null
+++ b/runtime/swoole.pid
@@ -0,0 +1 @@
+28180
\ No newline at end of file