fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/task__c/listViews/IsAssignmenter11112.listView-meta.xml

@@ -3,6 +3,7 @@
    <fullName>IsAssignmenter11112</fullName>
    <columns>NAME</columns>
    <columns>taskDifferent__c</columns>
    <columns>taskType__c</columns>
    <columns>assignee__c</columns>
    <columns>HopeWorkDescription__c</columns>
    <columns>FeedbackDescription__c</columns>
@@ -26,6 +27,6 @@
        <operation>equals</operation>
        <value>1</value>
    </filters>
    <label>已反馈的任务</label>
    <label>8 已反馈的任务</label>
    <language>zh_CN</language>
</ListView>