From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict

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

diff --git a/force-app/main/default/objects/OPDPlan__c/fields/If_NextMonth_Plan__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/If_NextMonth_Plan__c.field-meta.xml
index e16fc9c..81c5a1c 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/If_NextMonth_Plan__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/If_NextMonth_Plan__c.field-meta.xml
@@ -4,8 +4,8 @@
     <externalId>false</externalId>
     <formula>IF(
 AND(text(Status__c)=&quot;璁″垝涓�&quot;,
-    OPDPlan_ImplementDate__c &gt;= if(MONTH(today()) != 12,DATE(YEAR(today()), MONTH(today()) + 1, 1) ,DATE(YEAR(today()+1), 1, 1) ),
-    OPDPlan_ImplementDate__c &lt;= if(MONTH(today()) != 12,if(MONTH(today()) != 11,DATE(YEAR(today()), MONTH(today()) + 2, 1) - 1 ,DATE(YEAR(today()), 12, 31) ) ,DATE(YEAR(today()+1), 1, 31) ) ), 1, 0)</formula>
+    OPDPlan_ImplementDate__c &gt;= if(MONTH(today()) != 12,DATE(YEAR(today()), MONTH(today()) + 1, 1) ,DATE(YEAR(today())+1, 1, 1) ),
+    OPDPlan_ImplementDate__c &lt;= if(MONTH(today()) != 12,if(MONTH(today()) != 11,DATE(YEAR(today()), MONTH(today()) + 2, 1) - 1 ,DATE(YEAR(today()), 12, 31) ) ,DATE(YEAR(today())+1, 1, 31) ) ), 1, 0)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鏄惁涓嬫湀璁″垝(鍏紡)</label>
     <precision>18</precision>

--
Gitblit v1.9.1