From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/triggers/NFM202Opp.trigger | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/triggers/NFM202Opp.trigger b/force-app/main/default/triggers/NFM202Opp.trigger
index ca68116..c1334e8 100644
--- a/force-app/main/default/triggers/NFM202Opp.trigger
+++ b/force-app/main/default/triggers/NFM202Opp.trigger
@@ -1,5 +1,9 @@
trigger NFM202Opp on Opportunity (before update,before insert) {
-
+ // SWAG-CE55BX 棰勬祴浼樺寲 start
+ if (StaticParameter.EscapeOppandStaTrigger) {
+ return;
+ }
+ // SWAG-CE55BX 棰勬祴浼樺寲 end
if (NFM202Controller.isRunning) return;
NFM202OppHandler handler = new NFM202OppHandler();
--
Gitblit v1.9.1