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/QIS_Report__c/listViews/status_QIS.listView-meta.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml b/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml
index a64ddce..004a18b 100644
--- a/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/listViews/status_QIS.listView-meta.xml
@@ -11,6 +11,7 @@
<columns>QIS_final_judgement__c</columns>
<columns>next_action__c</columns>
<columns>QIS_Status__c</columns>
+ <columns>RECORDTYPE</columns>
<filterScope>Everything</filterScope>
<filters>
<field>RECORDTYPE</field>
--
Gitblit v1.9.1