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/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml
index 29f32e5..5cdaaba 100644
--- a/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml
+++ b/force-app/main/default/objects/PCLLostProduct__c/fields/LostProductName__c.field-meta.xml
@@ -3,8 +3,7 @@
<fullName>LostProductName__c</fullName>
<externalId>false</externalId>
<formula>LostProduct__r.Name</formula>
- <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>澶卞崟鍨嬪彿鍚嶇О</label>
+ <label>澶卞崟瀵规墜鍨嬪彿</label>
<required>false</required>
<trackTrending>false</trackTrending>
<type>Text</type>
--
Gitblit v1.9.1