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

diff --git a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml
index 9057b3a..dd049ce 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/ApplyMust_ProblemOccurredOther.validationRule-meta.xml
@@ -3,7 +3,7 @@
     <fullName>ApplyMust_ProblemOccurredOther</fullName>
     <active>true</active>
     <description>闂鍙戠敓鏃堕棿鎯呭喌 鍏朵粬</description>
-    <errorConditionFormula>( ISNEW()||DATEVALUE(CreatedDate) &gt;= DATE(2021,06,30)) &amp;&amp;  text(ProblemOccurred__c )=&apos;鍏朵粬&apos; &amp;&amp;  ISBLANK(ProblemOccurredSelect__c)</errorConditionFormula>
+    <errorConditionFormula>( ISNEW()||DATEVALUE(CreatedDate) &gt;= DATE(2021,06,30)) &amp;&amp;   text(ProblemOccurred__c )=&apos;鍏朵粬&apos; &amp;&amp;  ISBLANK(ProblemOccurredSelect__c)</errorConditionFormula>
     <errorDisplayField>ProblemOccurred__c</errorDisplayField>
     <errorMessage>閫夋嫨鍏朵粬鏃讹紝璇峰綍鍏ュ叿浣撳師鍥�</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1