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/task__c/listViews/IsAssignmenter11112.listView-meta.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/task__c/listViews/IsAssignmenter11112.listView-meta.xml b/force-app/main/default/objects/task__c/listViews/IsAssignmenter11112.listView-meta.xml
index c343245..7095454 100644
--- a/force-app/main/default/objects/task__c/listViews/IsAssignmenter11112.listView-meta.xml
+++ b/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>
--
Gitblit v1.9.1