From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict

---
 force-app/main/default/triggers/CampaignMemberTrigger.trigger |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/triggers/CampaignMemberTrigger.trigger b/force-app/main/default/triggers/CampaignMemberTrigger.trigger
index b3a9a79..2d3bb91 100644
--- a/force-app/main/default/triggers/CampaignMemberTrigger.trigger
+++ b/force-app/main/default/triggers/CampaignMemberTrigger.trigger
@@ -3,7 +3,9 @@
  * 鐧婚尣銇椼仧銉兗銉夈倰鏇淬伀 CampaignMember銇櫥閷层仚銈嬨��
  */
 trigger CampaignMemberTrigger on CampaignMember (before insert) {
-
+    if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+        return;
+    }
     // 鐧婚尣銇曘倢銇� CampaignMember銇� Contact銇屽煁銇俱仯銇︺亜銇熴倝銆丆ontact銇嬨倝鐧婚尣銇曘倢銇熴仺鍒ゆ柇銇椼��
     // 銉兗銉夈倰浣滄垚銇欍倠
     // 鍓层倞褰撱仸銉兗銉伅鍕曘亱銇曘仾銇忋仸銆丆ontact銇墍鏈夎�呫倰銉兗銉夈伄鎵�鏈夎�呫仺銇欍倠

--
Gitblit v1.9.1