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/Maintenance_Contract__c/fields/ContractM__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractM__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractM__c.field-meta.xml
index 5dcfa0c..8c2c374 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractM__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractM__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>ContractM__c</fullName>
     <externalId>false</externalId>
-    <formula>AND(DAY(Contract_Start_Date__c) - DAY(Contract_End_Date__c) = 1, MONTH(Contract_Start_Date__c)- MONTH(Contract_End_Date__c)=1)</formula>
+    <formula>AND(DAY(Contract_End_Date__c) - DAY(Contract_Start_Date__c) &gt;= 30, MONTH(Contract_Start_Date__c)- MONTH(Contract_End_Date__c)=1,VALUE(TEXT(Inspection_Time__c))* (Contract_Range__c/12)&lt;&gt;Service_contract_target_number__c)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鍚堝悓鏈堟暟</label>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1