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/Consumable_order__c/listViews/D10_approved_view.listView-meta.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Consumable_order__c/listViews/D10_approved_view.listView-meta.xml b/force-app/main/default/objects/Consumable_order__c/listViews/D10_approved_view.listView-meta.xml
index 79ffab4..5714e8a 100644
--- a/force-app/main/default/objects/Consumable_order__c/listViews/D10_approved_view.listView-meta.xml
+++ b/force-app/main/default/objects/Consumable_order__c/listViews/D10_approved_view.listView-meta.xml
@@ -4,6 +4,8 @@
<columns>NAME</columns>
<columns>Dealer_Info__c</columns>
<columns>Order_status__c</columns>
+ <columns>Order_date__c</columns>
+ <columns>IS_Price_Apply__c</columns>
<filterScope>Everything</filterScope>
<filters>
<field>RECORDTYPE</field>
--
Gitblit v1.9.1