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/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml b/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml
index e31e24b..0a802bc 100644
--- a/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml
+++ b/force-app/main/default/objects/On_Call__c/validationRules/Requst_On_call_complete_time.validationRule-meta.xml
@@ -3,7 +3,9 @@
     <fullName>Requst_On_call_complete_time</fullName>
     <active>true</active>
     <errorConditionFormula>Text(Status_c__c) = &apos;瀹屾瘯&apos; &amp;&amp; Isblank 
-(FinishDataTime__c )</errorConditionFormula>
+(FinishDataTime__c )
+&amp;&amp;
+$User.Username !=&apos;buli@deloitte.com.cn.stagefull&apos;</errorConditionFormula>
     <errorDisplayField>FinishDataTime__c</errorDisplayField>
     <errorMessage>On-Call瀹屾瘯鏃堕棿蹇呭～</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1