fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/triggers/ConsumApplyTrigger.trigger

@@ -1,4 +1,6 @@
trigger ConsumApplyTrigger on Consum_Apply__c (before insert, before update, after insert, after update, before delete, after delete) {
    ConsumApplyTriggerHandler handler = new ConsumApplyTriggerHandler();
    handler.run();
    if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){
        ConsumApplyTriggerHandler handler = new ConsumApplyTriggerHandler();
        handler.run();
    }
}