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

diff --git a/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml b/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml
index 1566373..8d86ea9 100644
--- a/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml
+++ b/force-app/main/default/objects/Report__c/validationRules/VOC_finish_chk.validationRule-meta.xml
@@ -18,5 +18,6 @@
 || ISCHANGED(VOC_Satisfy__c) 
 || ISCHANGED(VOC_Unsatisfy_Reason__c) 
 )</errorConditionFormula>
+    <errorDisplayField>AWS_Data_Id__c</errorDisplayField>
     <errorMessage>涓嶈兘缂栬緫宸茬粡缁撴潫鐨刅OC</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1