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

diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml
index 5b83660..6cb31e8 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_DateReceiptQuestions.validationRule-meta.xml
@@ -3,7 +3,9 @@
     <fullName>ApplyMust_DateReceiptQuestions</fullName>
     <active>true</active>
     <description>鐢宠淇悊鏃讹紝蹇呴』濉啓闂鑱旂粶鏀跺埌鏃�</description>
-    <errorConditionFormula>$Profile.Id != &apos;00e10000000dzzG&apos; /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */ 
+    <errorConditionFormula>$Profile.Id != &apos;00e10000000dzzG&apos; /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */
+&amp;&amp;
+$Profile.Id != &apos;00e10000000dEQx&apos;/* GPI_绯荤粺绠＄悊鍛� 涓嶆姤閿� */ 
 &amp;&amp; 
 $Profile.Id != &apos;00e10000000Y3o5&apos; /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */ 
 &amp;&amp; 

--
Gitblit v1.9.1