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/Maintenance_Contract__c/listViews/X01_All.listView-meta.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/listViews/X01_All.listView-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/listViews/X01_All.listView-meta.xml
index 226e9d9..e3add9a 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/listViews/X01_All.listView-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/listViews/X01_All.listView-meta.xml
@@ -5,6 +5,7 @@
<columns>Management_Code__c</columns>
<columns>Department__c</columns>
<columns>Status__c</columns>
+ <columns>Effective_Status__c</columns>
<columns>Estimation_Confirmation_Request__c</columns>
<columns>CREATED_DATE</columns>
<columns>Estimate_Trial_Money__c</columns>
--
Gitblit v1.9.1