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/QIS_Report__c/fields/OCM_Manager_Mail_F__c.field-meta.xml |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/OCM_Manager_Mail_F__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/OCM_Manager_Mail_F__c.field-meta.xml
index aef2adb..57625b7 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/OCM_Manager_Mail_F__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/OCM_Manager_Mail_F__c.field-meta.xml
@@ -29,7 +29,32 @@
 ) 
 )</description>
     <externalId>false</externalId>
-    <formula>&apos;it_prectech@olympus.com.cn&apos;</formula>
+    <formula>Case(Salesdepartment_Text__c, 
+&quot;1.鍗庡寳&quot;, &quot;OCM-BF-manager@olympus.com.cn&quot;, 
+&quot;2.涓滃寳&quot;, &quot;OCM-DB-manager@olympus.com.cn&quot;, 
+&quot;3.瑗垮寳&quot;, &quot;OCM-BF-manager@olympus.com.cn&quot;, 
+&quot;5.鍗庝笢&quot;, &quot;OCM-HD-manager@olympus.com.cn&quot;, 
+&quot;6.鍗庡崡&quot;, &quot;OCM-NF-manager@olympus.com.cn&quot;, 
+&quot;4.瑗垮崡&quot;, &quot;OCM-NF-manager@olympus.com.cn&quot;, 
+&quot;7.鑳介噺&quot;, 
+Case(Hospital__r.Hospita_Salesdepartment_Text__c, 
+&quot;1.鍗庡寳&quot;, &quot;OCM-BF-manager@olympus.com.cn&quot;, 
+&quot;2.涓滃寳&quot;, &quot;OCM-DB-manager@olympus.com.cn&quot;, 
+&quot;3.瑗垮寳&quot;, &quot;OCM-BF-manager@olympus.com.cn&quot;, 
+&quot;5.鍗庝笢&quot;, &quot;OCM-HD-manager@olympus.com.cn&quot;, 
+&quot;6.鍗庡崡&quot;, &quot;OCM-NF-manager@olympus.com.cn&quot;, 
+&quot;4.瑗垮崡&quot;, &quot;OCM-NF-manager@olympus.com.cn&quot;, 
+&quot;&quot;), 
+Case(RCCD_Text__c, 
+&quot;鍗庡寳&quot;, &quot;OCM-BF-manager@olympus.com.cn&quot;, 
+&quot;涓滃寳&quot;, &quot;OCM-DB-manager@olympus.com.cn&quot;, 
+&quot;瑗垮寳&quot;, &quot;OCM-BF-manager@olympus.com.cn&quot;, 
+&quot;鍗庝笢&quot;, &quot;OCM-HD-manager@olympus.com.cn&quot;, 
+&quot;鍗庡崡&quot;, &quot;OCM-NF-manager@olympus.com.cn&quot;, 
+&quot;瑗垮崡&quot;, &quot;OCM-NF-manager@olympus.com.cn&quot;, 
+&quot;olympussupport@sunbridge.com&quot; 
+) 
+)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>OCSM Manager Mail F</label>
     <required>false</required>

--
Gitblit v1.9.1