From 8a8319e3fb98e9700f26c604bcaead27a35a6b2f Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 27 Mar 2024 10:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=95=86=E5=BA=94=E8=AF=A5=E5=85=B3=E8=81=94=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=EF=BC=8C=E4=BD=86=E6=98=AF=E5=85=B3=E8=81=94=E5=88=B0?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E5=95=86=E6=88=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/agent/agent/template/edit.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/marketing/agent/agent/template/edit.vue b/src/views/marketing/agent/agent/template/edit.vue
index 5a89be1..e4d8894 100644
--- a/src/views/marketing/agent/agent/template/edit.vue
+++ b/src/views/marketing/agent/agent/template/edit.vue
@@ -121,6 +121,7 @@
                 <el-form-item label="关联商户：">
                   <search-mer
                     :mer_id="info.mer_id_list"
+                    :merchant_type="1"
                     @change="changeMer($event,-1)"
                     :is_multiple="true"
                     :selected_shop="selectedShop['shop_mer'] || {}"
@@ -296,6 +297,7 @@
                     <el-form-item label="关联商户：">
                       <search-mer
                         :mer_id="children_list[index].mer_id_list"
+                        :merchant_type="1"
                         @change="changeMer($event,index)"
                         :is_multiple="true"
                         :selected_shop="selectedShop['shop_mer'] || {}"