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/Application_for_Conference_Adjudication__c/listViews/All.listView-meta.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/objects/Application_for_Conference_Adjudication__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/Application_for_Conference_Adjudication__c/listViews/All.listView-meta.xml
index 6797ccb..aca1859 100644
--- a/force-app/main/default/objects/Application_for_Conference_Adjudication__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/Application_for_Conference_Adjudication__c/listViews/All.listView-meta.xml
@@ -3,12 +3,13 @@
<fullName>All</fullName>
<columns>NAME</columns>
<columns>MeetingApprovedNo__c</columns>
- <columns>Num__c</columns>
- <columns>BudgetType__c</columns>
- <columns>OfficeCategory__c</columns>
<columns>ProcessState__c</columns>
- <columns>CREATEDBY_USER</columns>
+ <columns>CampaignTheme__c</columns>
+ <columns>MeetingType__c</columns>
+ <columns>Num__c</columns>
+ <columns>OWNER.ALIAS</columns>
<columns>CREATED_DATE</columns>
+ <columns>UPDATEDBY_USER.ALIAS</columns>
<columns>LAST_UPDATE</columns>
<filterScope>Everything</filterScope>
<label>鍏ㄩ儴</label>
--
Gitblit v1.9.1