fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/Repair__c/fields/NewProductGuarante_Formula__c.field-meta.xml

@@ -21,7 +21,7 @@
    <externalId>false</externalId>
    <formula>IF(OR(AND(ISBLANK(FSE_ApplyForRepair_Day__c), DATEVALUE(CreatedDate) &gt; Delivered_Product__r.Guarantee_period_for_products__c), 
AND(NOT(ISBLANK(FSE_ApplyForRepair_Day__c)),FSE_ApplyForRepair_Day__c &gt; Delivered_Product__r.Guarantee_period_for_products__c))
/* &quot;修理创建日&quot; 大于 保修期限 或者 &quot;SAP修理申请日”大于 保修期限，无偿区别标志为空 */ 
/* &quot;修理创建日&quot; 大于 保修期限 或者 &quot;FSE修理申请日”大于 保修期限，无偿区别标志为空 */ 
,&apos;&apos; 
,IF(Delivered_Product__r.guarantee_period__c &lt;= 366 
/* 保修天数 小于等于 366日 */