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/fields/Repair_Determine__c.field-meta.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/force-app/main/default/objects/Repair__c/fields/Repair_Determine__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Repair_Determine__c.field-meta.xml index 9868a1d..2035958 100644 --- a/force-app/main/default/objects/Repair__c/fields/Repair_Determine__c.field-meta.xml +++ b/force-app/main/default/objects/Repair__c/fields/Repair_Determine__c.field-meta.xml @@ -3,7 +3,7 @@ <fullName>Repair_Determine__c</fullName> <externalId>false</externalId> <formula>if(Text(ifDeadHurt__c) = '鏈�','瑕�', - if(Text(ifDeadHurt__c) = '鏃�','涓嶈',''))</formula> +if(Text(ifDeadHurt__c) = '鏃�','涓嶈',''))</formula> <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs> <label>瑕佷笉瑕佽繘琛屼慨鐞嗙殑鍒ゅ畾</label> <required>false</required> -- Gitblit v1.9.1