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/Request_input_collect_money_date.validationRule-meta.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml b/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml
index a907944..adf3da9 100644
--- a/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml
+++ b/force-app/main/default/objects/Repair__c/validationRules/Request_input_collect_money_date.validationRule-meta.xml
@@ -3,6 +3,5 @@
<fullName>Request_input_collect_money_date</fullName>
<active>true</active>
<errorConditionFormula>AND(ISBLANK(Received_money_day_finacial_dapt__c),Confirmed_Collect_money__c=TRUE)</errorConditionFormula>
- <errorDisplayField>Received_money_day_finacial_dapt__c</errorDisplayField>
<errorMessage>璇疯緭鍏ュ埌娆炬棩</errorMessage>
</ValidationRule>
--
Gitblit v1.9.1