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

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml
index d221504..616bcb2 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/validationRules/CheckUpper_limitReason.validationRule-meta.xml
@@ -3,7 +3,7 @@
     <fullName>CheckUpper_limitReason</fullName>
     <active>true</active>
     <description>涓嶅悓鎰忎笂闄愮悊鐢辨椂锛屽閫夊拰鍏朵粬蹇呴』鏈変竴涓�</description>
-    <errorConditionFormula>AND( $Profile.Id != &apos;00e10000000Y3o5&apos;, $Profile.Id != &apos;00e10000000dzzG&apos;,NOT(agree_Upper_limit__c) , 
+    <errorConditionFormula>AND( $Profile.Id != &apos;00e10000000Y3o5&apos;, $Profile.Id != &apos;00e10000000dzzG&apos;,$Profile.Id != &apos;00e10000000dEQx&apos;,NOT(agree_Upper_limit__c) , 
 AND(	
 ISBLANK( Not_Upper_limit_reason__c ),ISBLANK( Not_Upper_limit_reasonSelect__c )),
 ISBLANK(contractNextYear__c), 

--
Gitblit v1.9.1