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/RentalApplyOtherTrigger.trigger | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/triggers/RentalApplyOtherTrigger.trigger b/force-app/main/default/triggers/RentalApplyOtherTrigger.trigger
index 9a675c4..7ab0260 100644
--- a/force-app/main/default/triggers/RentalApplyOtherTrigger.trigger
+++ b/force-app/main/default/triggers/RentalApplyOtherTrigger.trigger
@@ -1,4 +1,7 @@
trigger RentalApplyOtherTrigger on Rental_Apply__c (before insert, before update, after insert, after update, after delete) {
+ if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+ return;
+ }
//SWAG-B3U63C 2018/8/21 鏇存柊瀛︿細鍩硅鐨勭敵璇峰鍝佺敵璇峰崟鏁� start
if (Trigger.isAfter) {
list<id> CampaignID = new list<id>();
--
Gitblit v1.9.1