From 6e4766bc135c30fa9e02a2b527dcdf8fd5eeec8d Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:54:22 +0800
Subject: [PATCH] mergecode0626

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

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Assign_EndDate__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Assign_EndDate__c.field-meta.xml
index 8ef5b5b..e9a1aaf 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Assign_EndDate__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Assign_EndDate__c.field-meta.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Assign_EndDate__c</fullName>
+    <description>//update fxk 2021/11/12 鏂板姞if鍒ゆ柇</description>
     <externalId>false</externalId>
-    <formula>ADDMONTHS(Contract_Start_Date__c,(FLOOR((DATE(2021,10,08) - Contract_Start_Date__c)/365)+1)*12)</formula>
+    <formula>if(Contract_Start_Date__c &lt; DATE(2021,10,08),
+			ADDMONTHS(Contract_Start_Date__c ,(FLOOR(( DATE(2021,10,08)  -  Contract_Start_Date__c )/365)+1) *12),
+			ADDMONTHS(Contract_Start_Date__c ,(FLOOR(( DATE(2021,10,08)  -  Contract_Start_Date__c )/365)) *12))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>鎸囧畾缁撴潫鏃ユ湡</label>
+    <label>鎸囧畾鏃ユ湡缁撴潫鏃�</label>
     <required>false</required>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>

--
Gitblit v1.9.1