Merge branch 'master' of http://47.92.229.245:8089/r/OlympusSSBG

GWY

2022-04-15 b823c7f3569cf9368e2245846e918f78f32e903a

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

@@ -1,4 +1,7 @@
trigger OpportunityTrigger on Opportunity (before insert, before update, after insert, after update) {
    if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
        return;
    }
    
    if(Trigger.new[0].DealerIsOk__c == true && Trigger.new[0].CrossCooperativeDealer__c == null){
        Trigger.new[0].addError('请填写合作区域代理商');