fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 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>