From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/objects/QIS_Report__c/fields/OCM_Repair_Mail1_F__c.field-meta.xml |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/OCM_Repair_Mail1_F__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/OCM_Repair_Mail1_F__c.field-meta.xml
index 28c2504..543c618 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/OCM_Repair_Mail1_F__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/OCM_Repair_Mail1_F__c.field-meta.xml
@@ -1,23 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>OCM_Repair_Mail1_F__c</fullName>
-    <externalId>false</externalId>
-    <formula>Case(Salesdepartment_Text__c,
-&quot;3.瑗垮寳&quot;, &quot;SFDC_Wangqingli@olympus.com.cn&quot;,
-&quot;4.瑗垮崡&quot;, &quot;liuyan@prec-tech.com&quot;,
+    <description>Case(Salesdepartment_Text__c,
+&quot;3.瑗垮寳&quot;, &quot;OCM-XARC@olympus.com.cn&quot;,
+&quot;4.瑗垮崡&quot;, &quot;OCM-CDRC@olympus.com.cn&quot;,
 &quot;7.鑳介噺&quot;,
 Case(Hospital__r.Hospita_Salesdepartment_Text__c,
-&quot;3.瑗垮寳&quot;, &quot;SFDC_Wangqingli@olympus.com.cn&quot;,
-&quot;4.瑗垮崡&quot;, &quot;liuyan@prec-tech.com&quot;,
+&quot;3.瑗垮寳&quot;, &quot;OCM-XARC@olympus.com.cn&quot;,
+&quot;4.瑗垮崡&quot;, &quot;OCM-CDRC@olympus.com.cn&quot;,
 &quot;&quot;),
 Case(RCCD_Text__c,
-&quot;瑗垮寳&quot;, &quot;SFDC_Wangqingli@olympus.com.cn&quot;,
-&quot;瑗垮崡&quot;, &quot;liuyan@prec-tech.com&quot;,
+&quot;瑗垮寳&quot;, &quot;OCM-XARC@olympus.com.cn&quot;,
+&quot;瑗垮崡&quot;, &quot;OCM-CDRC@olympus.com.cn&quot;,
 Case(Province_Text__c,
-&quot;娴欐睙鐪�&quot;, &quot;SFDC_LiJin@olympus.com.cn&quot;,
+&quot;娴欐睙鐪�&quot;, &quot;OCM-HZRC@olympus.com.cn&quot;,
+&quot;&quot;)
+)
+)</description>
+    <externalId>false</externalId>
+    <formula>Case(Salesdepartment_Text__c,
+&quot;3.瑗垮寳&quot;, &quot;OCM-XARC@olympus.com.cn&quot;,
+&quot;4.瑗垮崡&quot;, &quot;Yang_Fan@olympus.com.cn&quot;,
+&quot;7.鑳介噺&quot;,
+Case(Hospital__r.Hospita_Salesdepartment_Text__c,
+&quot;3.瑗垮寳&quot;, &quot;OCM-XARC@olympus.com.cn&quot;,
+&quot;4.瑗垮崡&quot;, &quot;Yang_Fan@olympus.com.cn&quot;,
+&quot;&quot;),
+Case(RCCD_Text__c,
+&quot;瑗垮寳&quot;, &quot;OCM-XARC@olympus.com.cn&quot;,
+&quot;瑗垮崡&quot;, &quot;Yang_Fan@olympus.com.cn&quot;,
+Case(Province_Text__c,
+&quot;娴欐睙鐪�&quot;, &quot;OCM-HZRC@olympus.com.cn&quot;,
 &quot;&quot;)
 )
 )</formula>
+    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>OCSM Repair Mail1 F</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1