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

diff --git a/force-app/main/default/objects/task__c/fields/RelatedInformation_ID__c.field-meta.xml b/force-app/main/default/objects/task__c/fields/RelatedInformation_ID__c.field-meta.xml
index 603f22f..28c38ec 100644
--- a/force-app/main/default/objects/task__c/fields/RelatedInformation_ID__c.field-meta.xml
+++ b/force-app/main/default/objects/task__c/fields/RelatedInformation_ID__c.field-meta.xml
@@ -5,10 +5,11 @@
 褰撴槸OPD浠诲姟鏃跺彇鈥滀骇鍝佹槑缁嗏�濓紝褰撴槸璇环浠诲姟鏄彇鈥滆浠封��
 濡傛灉鏄骞翠繚浠诲姟/鐐规浠诲姟/SLA浠诲姟鏃舵槸鍙栤�滅淮淇悎鍚岀紪鐮佲�滐紝</description>
     <externalId>false</externalId>
-    <formula>IF( (RecordType.DeveloperName == &apos;Other&apos;||RecordType.DeveloperName == &apos;DailyVisit&apos;)&amp;&amp; Text(taskDifferent__c) == &apos;涓婄骇鍒嗛厤浠诲姟&apos;, &apos;&apos;,
-IF( RecordType.DeveloperName  == &apos;OPD&apos;, &apos;&apos;,
-IF(RecordType.DeveloperName == &apos;OpportunityFollow&apos; ,  OpportunityId__r.Id ,
-IF(RecordType.DeveloperName == &apos;VM_Contract_Task&apos;||RecordType.DeveloperName == &apos;InspectUp_Task&apos; ||RecordType.DeveloperName == &apos;SLAReport_Task&apos; , Maintenance_Contract__r.Id ,&apos;&apos;))))</formula>
+    <formula>IF( 
+    (RecordType.DeveloperName == &apos;Other&apos;||RecordType.DeveloperName == &apos;DailyVisit&apos;) &amp;&amp; Text(taskDifferent__c) == &apos;涓婄骇鍒嗛厤浠诲姟&apos;, &apos;&apos;,
+    IF( RecordType.DeveloperName  == &apos;OPD&apos;, &apos;&apos;,
+        IF(RecordType.DeveloperName == &apos;OpportunityFollow&apos; || RecordType.DeveloperName == &apos;winBiddingTask&apos; || RecordType.DeveloperName == &apos;LoseListTask&apos; ,  OpportunityId__r.Id ,
+            IF(RecordType.DeveloperName == &apos;VM_Contract_Task&apos;||RecordType.DeveloperName == &apos;InspectUp_Task&apos; ||RecordType.DeveloperName == &apos;SLAReport_Task&apos; , Maintenance_Contract__r.Id ,&apos;&apos;))))</formula>
     <label>鐩稿叧淇℃伅(ID)</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1