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/Repair__c/fields/Recall_Correspondence__c.field-meta.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/Recall_Correspondence__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Recall_Correspondence__c.field-meta.xml
index e263d44..8d389ca 100644
--- a/force-app/main/default/objects/Repair__c/fields/Recall_Correspondence__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Recall_Correspondence__c.field-meta.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Recall_Correspondence__c</fullName>
-    <description>LJPH-C9F3Z2</description>
+    <description>LJPH-C9F3Z2
+IF(!ISBLANK( TEXT(Delivered_Product__r.Market_Product_Category__c) ),
+IF( ISBLANK( TEXT(Delivered_Product__r.Marketing_Result__c) ) , true,
+false) ,
+NULL)</description>
     <externalId>false</externalId>
     <formula>IF(!ISBLANK( TEXT(Delivered_Product__r.Market_Product_Category__c) ),  
-   IF( ISBLANK( TEXT(Delivered_Product__r.Marketing_Result__c) ) , true, 
-false) ,
- NULL)</formula>
+   IF( ISBLANK( TEXT(Delivered_Product__r.Marketing_Result__c) ) , 
+   IF( Delivered_Product__r.Marketing_Input_Date__c&gt; DATEVALUE(&apos;2021-12-01&apos;),true,false), 
+false),false)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鏄惁闇�瑕佸彫鍥炲搴�</label>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1