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/Rental_Apply_Sequence__c/fields/Apply_Set_Detail_ExternalKey__c.field-meta.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Rental_Apply_Sequence__c/fields/Apply_Set_Detail_ExternalKey__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Sequence__c/fields/Apply_Set_Detail_ExternalKey__c.field-meta.xml
index 071e6dd..a7b9f1a 100644
--- a/force-app/main/default/objects/Rental_Apply_Sequence__c/fields/Apply_Set_Detail_ExternalKey__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Sequence__c/fields/Apply_Set_Detail_ExternalKey__c.field-meta.xml
@@ -3,6 +3,7 @@
<fullName>Apply_Set_Detail_ExternalKey__c</fullName>
<externalId>false</externalId>
<formula>Apply_Set_Detail__r.ExternalKey__c</formula>
+ <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁咵xternalKey</label>
<required>false</required>
<trackHistory>false</trackHistory>
--
Gitblit v1.9.1