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/Rental_Apply__c/fields/OPDManager__c.field-meta.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/OPDManager__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/OPDManager__c.field-meta.xml
index 7062ce8..7501094 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/OPDManager__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/OPDManager__c.field-meta.xml
@@ -5,10 +5,15 @@
     <externalId>false</externalId>
     <formula>IF(AND(!ISBLANK(Old_Rental_Apply__c),ISBLANK(OriginalOpdPlanApplication__c))
 ,OPDManagerText__c
-,if( SalesManagerSubmit__c == OPDPlan__r.SalesManager_Txt__c ||( ISBLANK(Old_Rental_Apply__c) &amp;&amp;  SalesManager__c == OPDPlan__r.SalesManager__c) ,OPDPlan__r.SalesManager_Txt__c,&apos;&apos;)
+,IF(!ISBLANK(OPDManagerApprover__c)
+	,OPDManagerApprover__c
+	,
+	IF(OR( AND(!ISBLANK(Request_demo_day__c), Request_demo_day__c &gt; DATE(2022,09,29)),DATEVALUE(CreatedDate) &gt; DATE(2022,09,29)) ,OPDManagerApprover__c,
+		if( SalesManagerSubmit__c == OPDPlan__r.SalesManager_Txt__c ||( ISBLANK(Old_Rental_Apply__c) &amp;&amp;  SalesManager__c == OPDPlan__r.SalesManager__c) ,OPDPlan__r.SalesManager_Txt__c,&apos;&apos;)
+	)
+	)
 )</formula>
-    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>OPD璁″垝瀹℃壒缁忕悊</label>
+    <label>OPD璁″垝瀹℃壒CL6 缁忕悊绾�</label>
     <required>false</required>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>

--
Gitblit v1.9.1