fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

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

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