From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_F__c.field-meta.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_F__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_F__c.field-meta.xml
index 65e550f..3bcaa4f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_F__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Guzhangpaicha_Final_reply_day_F__c.field-meta.xml
@@ -10,16 +10,15 @@
         Bollow_Date_Add_10_WD__c),
       /* 鍦�21澶╁唴鍚屾剰缁翠慨鎶ヤ环 */
       IF(ISBLANK(Rental_Apply__r.Repair__r.Agreed_Date__c),
-          IF(TODAY() &lt;= Rental_Apply__r.Repair__r.Repair_Quotation_date__c + 21,
+          IF(TODAY() &lt;= Rental_Apply__r.Repair__r.Repair_Quotation_date__c + 21 + NULLVALUE(Condition_X21_Days__c,0),
             Rental_End_Date__c, Rental_Apply__r.Repair__r.Repair_Quotation_date__c + 24
           ),
-          IF(Rental_Apply__r.Repair__r.Agreed_Date__c &lt;= Rental_Apply__r.Repair__r.Repair_Quotation_date__c + 21,
+          IF(Rental_Apply__r.Repair__r.Agreed_Date__c &lt;= Rental_Apply__r.Repair__r.Repair_Quotation_date__c + 21 + NULLVALUE(Condition_X21_Days__c,0),
             Rental_Apply__r.Repair__r.Repair_Shipped_Date__c + 14, Rental_Apply__r.Repair__r.Repair_Quotation_date__c + 24
           )
       )
     )
 ,null)</formula>
-    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鏈�鏂伴瀹氬綊杩樻棩_鏁呴殰鎺掓煡_F</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1