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/Account_Number_of_target__c/fields/RivalCustomers_first__c.field-meta.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalCustomers_first__c.field-meta.xml b/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalCustomers_first__c.field-meta.xml
index d6bdd2f..69d8ea7 100644
--- a/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalCustomers_first__c.field-meta.xml
+++ b/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalCustomers_first__c.field-meta.xml
@@ -2,7 +2,16 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>RivalCustomers_first__c</fullName>
     <externalId>false</externalId>
-    <formula>IF( RivalHostsProportion_first__c == 1, &apos;瀹屽叏瀵规墜瀹㈡埛&apos;,  IF( RivalHostsProportion_first__c &gt; 0.5, &apos;閮ㄥ垎瀵规墜瀹㈡埛&apos;,&apos;&apos;))</formula>
+    <formula>IF( !ISNULL(RivalHostsProportion_first__c),
+    IF( RivalHostsProportion_first__c == 1, 
+        &apos;瀹屽叏瀵规墜瀹㈡埛&apos;, 
+        IF( RivalHostsProportion_first__c &gt;= 0.5, 
+            &apos;閮ㄥ垎瀵规墜瀹㈡埛&apos;,
+            &apos;&apos;
+        )
+    ),
+    &apos;&apos;
+)</formula>
     <label>瀵规墜瀹㈡埛锛堟湡鍒濓級</label>
     <required>false</required>
     <trackTrending>false</trackTrending>

--
Gitblit v1.9.1