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/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml b/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml
index 2ff7065..304b0f9 100644
--- a/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml
+++ b/force-app/main/default/objects/task__c/validationRules/NotAdminCannotCreateTask.validationRule-meta.xml
@@ -3,6 +3,6 @@
     <fullName>NotAdminCannotCreateTask</fullName>
     <active>true</active>
     <description>闈炵郴缁熺鐞嗗憳涓嶈兘鍒涘缓琚姩浠诲姟</description>
-    <errorConditionFormula>ISNEW() &amp;&amp; Text(taskDifferent__c) = &apos;琚姩浠诲姟&apos; &amp;&amp;  $User.ProfileId != &apos;00e10000000Y3o5&apos;</errorConditionFormula>
+    <errorConditionFormula>ISNEW() &amp;&amp; Text(taskDifferent__c) = &apos;琚姩浠诲姟&apos; &amp;&amp;  $User.ProfileId != &apos;00e10000000Y3o5&apos; &amp;&amp;  RecordTypeId != &apos;0129D000001NZXh&apos; &amp;&amp; RecordTypeId != &apos;0129D000001NZXj&apos;</errorConditionFormula>
     <errorMessage>闈炵郴缁熺鐞嗗憳涓嶈兘鍒涘缓琚姩浠诲姟</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1