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

diff --git a/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml
index eca3f88..a21af7f 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/No_ChangeIF_After_Draf.validationRule-meta.xml
@@ -6,8 +6,7 @@
 /*(TEXT(Status__c) != &quot;鑽夋涓�&quot; &amp;&amp; TEXT(Status__c) != &apos;1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)&apos; &amp;&amp; TEXT(Status__c) != &quot;4.淇悊鍝佽繑閫侀樁娈�&quot;)&amp;&amp;*/
 
 /*銉°兂銉嗐儕銉炽偣銇仧銈併�併偡銈广儐銉犵鐞嗚�呫伅淇鍙兘*/
-$Profile.Id != &apos;00e10000000Y3o5&apos;
-&amp;&amp;
+$Profile.Id != &apos;00e10000000Y3o5&apos; &amp;&amp;
 NOT(ISNULL(SAP_Transfer_time__c))
 &amp;&amp;
 (

--
Gitblit v1.9.1