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

diff --git a/force-app/main/default/objects/Report__c/validationRules/Required_Use_Materials.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/Required_Use_Materials.validationRule-meta.xml
index cd0183d..49a8031 100644
--- a/force-app/main/default/objects/Report__c/validationRules/Required_Use_Materials.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/Required_Use_Materials.validationRule-meta.xml
@@ -5,7 +5,9 @@
     <errorConditionFormula>Text(Status__c) = &apos;鐢宠珛涓�&apos; &amp;&amp; (
 /* NTC/TTC */
 (RecordTypeId = &apos;01210000000Qeko&apos; &amp;&amp; (Isnull(Use_Materials__c) || Isblank(Use_Materials__c)))
-)</errorConditionFormula>
+)
+&amp;&amp;
+ $User.Username != &apos;buli@deloitte.com.cn.stagefull&apos;</errorConditionFormula>
     <errorDisplayField>Use_Materials__c</errorDisplayField>
     <errorMessage>浣跨敤璧勬枡蹇呴��</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1