fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/task__c/fields/IsConfirm__c.field-meta.xml

@@ -3,9 +3,9 @@
    <fullName>IsConfirm__c</fullName>
    <description>// 2021-07-29    mzy  add      当任务确认日为空时 , 显示0 否则显示 1  ,目的是为了能有效分析未执行是未接受还是接受后没有填写日报</description>
    <externalId>false</externalId>
    <formula>IF(ISBLANK(taskHandleDate__c) ,0,1)</formula>
    <formula>IF(ISBLANK(taskHandleDate__c) ,1,0)</formula>
    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
    <label>是否确认</label>
    <label>未确认</label>
    <precision>18</precision>
    <required>false</required>
    <scale>0</scale>