From 598bc8ec416bdc8c162cedc2c723322566a19f00 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 22 Sep 2023 18:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=94=B3=E8=AF=B7-=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=89=93=E5=8C=85=E5=95=86=E5=9F=8E=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=EF=BC=8C=E9=81=BF=E5=85=8D=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0=E9=83=BD=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 87cec1e89..af047d4c9 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -407,13 +407,13 @@ class CompanyController extends BaseAdminController
             // 插入审批流
             $approveModel->type = $shopApproveType == 1? 2: 3; //  审批类型，后台配置 1 其他任务 2商户入驻 3开通交易
             $approveModel->flow_id = 2;
-            $approveModel->name = $shopApproveType == 1? '商户入驻审批': '商户开通交易审批';
+            $approveModel->name = $shopApproveType == 1? '商户入驻审批': '开通交易审批';
             $approveModel->admin_id = 0; // 后台发起人id 暂时为0
             $approveModel->department_id = '0';
             $approveModel->check_admin_ids = $company['admin_id']; // 当前审批人ID 镇管理公司负责人
             $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
             $approveModel->other_type = 6;
-            $approveModel->extend = json_encode($data);
+            $approveModel->extend = json_encode(array_merge($params, $data));
             $approveModel->create_time = time();
             $approveModel->update_time = time();
             $approveModel->save();