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

diff --git a/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml b/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml
index b9ca90b..cc3038e 100644
--- a/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/validationRules/Campaign_SubreportStatus_Confim.validationRule-meta.xml
@@ -7,5 +7,6 @@
 IF( Campaign__c != null , 
   IF( TEXT(Campaign__r.Status) = &apos;宸叉彁浜ゆ姤鍛�&apos; , true, false), 
 false))&amp;&amp;or(isnew(),text(Status__c)==&apos;鑽夋涓�&apos;)&amp;&amp; Not(ischanged(Loaner_cancel_request__c))</errorConditionFormula>
+    <errorDisplayField>Repair__c</errorDisplayField>
     <errorMessage>瀛︿細宸叉彁浜ゆ姤鍛婏紝涓嶈兘淇濆瓨</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1