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

diff --git a/force-app/main/default/objects/QIS_Report__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml b/force-app/main/default/objects/QIS_Report__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml
index 7d2d78a..849fb2b 100644
--- a/force-app/main/default/objects/QIS_Report__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/validationRules/ApplyMust_ifDeadHurt.validationRule-meta.xml
@@ -3,6 +3,8 @@
     <fullName>ApplyMust_ifDeadHurt</fullName>
     <active>true</active>
     <errorConditionFormula>$Profile.Id != &apos;00e10000000dzzG&apos; /* GPI_绯荤粺绠＄悊鍛楴ew 涓嶆姤閿� */ 
+&amp;&amp;
+$Profile.Id != &apos;00e10000000dEQx&apos; 
 &amp;&amp; $Profile.Id != &apos;00e10000000Y3o5&apos; /* 绯荤粺绠＄悊鍛� 涓嶆姤閿� */ 
 &amp;&amp; $User.Id != &apos;00510000000fSYI&apos; /* Batch User 涓嶆姤閿� */
 &amp;&amp;OR(Text( QIS_Status__c )==&apos;FSE濉啓瀹屾瘯&apos;, 

--
Gitblit v1.9.1