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

diff --git a/force-app/main/default/objects/OPDPlan__c/fields/Is_Beyond_Plan__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/Is_Beyond_Plan__c.field-meta.xml
index b8b19f9..890198f 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/Is_Beyond_Plan__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/Is_Beyond_Plan__c.field-meta.xml
@@ -4,7 +4,7 @@
     <externalId>false</externalId>
     <formula>IF(
     NOT(ISNULL(OPDPlan_ImplementDate__c)) &amp;&amp; 
-    YEAR(OPDPlan_ImplementDate__c) == YEAR(DATEVALUE(CreatedDate)) &amp;&amp; 
+    YEAR(OPDPlan_ImplementDate__c) == YEAR(DATEVALUE(CreatedDate)) &amp;&amp;
     MONTH(OPDPlan_ImplementDate__c) == MONTH(DATEVALUE(CreatedDate)),
     &apos;鏄�&apos;,
     &apos;鍚�&apos;

--
Gitblit v1.9.1