From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml b/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml
index d60a8ca..27413f0 100644
--- a/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml
+++ b/force-app/main/default/objects/PromotionHead__c/fields/Status__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Status__c</fullName>
     <externalId>false</externalId>
-    <formula>if(ApplyStatus__c != &apos;鍚屾剰&apos;,&apos;鏃犳晥&apos;,if(RecordType.Id == &apos;0121m000000kX4n&apos;,&apos;鏈夋晥&apos;,if(DateFrom__c &gt; today(),&apos;鏃犳晥&apos;,if (today()&lt;DateTo__c, &apos;鏈夋晥&apos;, &apos;鏃犳晥&apos;))))</formula>
+    <formula>if(ApplyStatus__c != &apos;鍚屾剰&apos;,&apos;鏃犳晥&apos;,if(RecordType.Id == &apos;01210000000aLmv&apos;,&apos;鏈夋晥&apos;,if(DateFrom__c &gt; today(),&apos;鏃犳晥&apos;,if (today()&lt;=DateTo__c, &apos;鏈夋晥&apos;, &apos;鏃犳晥&apos;))))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鏈夋晥/鏃犳晥</label>
     <required>false</required>

--
Gitblit v1.9.1