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

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/AD_Status__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/AD_Status__c.field-meta.xml
index 5c69e69..db09122 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/AD_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/AD_Status__c.field-meta.xml
@@ -2,9 +2,8 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>AD_Status__c</fullName>
     <externalId>false</externalId>
-    <formula>IF(TODAY()-Aware_date__c &gt;=10,&apos;绗�&apos;&amp;text(TODAY()-Aware_date__c)&amp;&apos;澶╀互涓�&apos;,
-&apos;绗�0&apos;&amp;text(TODAY()-Aware_date__c)&amp;&apos;澶�&apos;)
-/*if( AND(ISBLANK(text(OCSMAdministrativeReportStatus__c)), Aware_date__c != null),&apos;绗�0&apos;&amp;text(TODAY()-Aware_date__c)&amp;&apos;澶�&apos;,null)*/</formula>
+    <formula>if(TODAY()-Aware_date__c &gt;=30,&apos;绗�30澶╀互涓�&apos;,IF(TODAY()-Aware_date__c &gt;=10,&apos;绗�&apos;&amp;text(TODAY()-Aware_date__c)&amp;&apos;澶�&apos;,
+&apos;绗�0&apos;&amp;text(TODAY()-Aware_date__c)&amp;&apos;澶�&apos;))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>寰呮姤鍛婄姸鍐�</label>
     <required>false</required>

--
Gitblit v1.9.1