From 2002d6dc123983ff01ddb6b0fd71f29fc2452ad4 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 30 May 2023 11:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=90=8E=E5=8F=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=95=86=E6=88=B7=E5=B7=B2=E7=BC=B4=E7=BA=B3=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/Merchant.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index 1e813551..14dbbc9d 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -147,6 +147,7 @@ class Merchant extends BaseController
         $margin = $this->repository->checkMargin($id, $data['type_id']);
         $data['margin'] = $margin['margin'];
         $data['is_margin'] = $margin['is_margin'];
+        $data['ot_margin'] = $data['paid_margin'];
         $datas=$data;
         $this->repository->update($id, $datas);
         return app('json')->success('编辑成功');