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/RivalHostsProportion_first__c.field-meta.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalHostsProportion_first__c.field-meta.xml b/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalHostsProportion_first__c.field-meta.xml
index 338414a..e963b6d 100644
--- a/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalHostsProportion_first__c.field-meta.xml
+++ b/force-app/main/default/objects/Account_Number_of_target__c/fields/RivalHostsProportion_first__c.field-meta.xml
@@ -2,7 +2,10 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>RivalHostsProportion_first__c</fullName>
     <externalId>false</externalId>
-    <formula>( RivalHostsNumber_first__c / AllHostsNumber_first__c )</formula>
+    <formula>IF( !ISNULL(RivalHostsNumber_first__c) &amp;&amp; !ISNULL(AllHostsNumber_first__c) &amp;&amp; AllHostsNumber_first__c &gt; 0,
+    ( RivalHostsNumber_first__c / AllHostsNumber_first__c ),
+    null
+)</formula>
     <label>瀵规墜涓绘満鍗犳瘮锛堟湡鍒濓級</label>
     <precision>18</precision>
     <required>false</required>

--
Gitblit v1.9.1