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/Consum_Apply_Equipment_Set_Detail__c/fieldSets/ConsumEquipmentSetShipment_R.fieldSet-meta.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/fieldSets/ConsumEquipmentSetShipment_R.fieldSet-meta.xml b/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/fieldSets/ConsumEquipmentSetShipment_R.fieldSet-meta.xml
index a55aea8..8c6210d 100644
--- a/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/fieldSets/ConsumEquipmentSetShipment_R.fieldSet-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply_Equipment_Set_Detail__c/fieldSets/ConsumEquipmentSetShipment_R.fieldSet-meta.xml
@@ -57,5 +57,10 @@
<isFieldManaged>false</isFieldManaged>
<isRequired>false</isRequired>
</displayedFields>
+ <displayedFields>
+ <field>boxbarcodeforReceipt__c</field>
+ <isFieldManaged>false</isFieldManaged>
+ <isRequired>false</isRequired>
+ </displayedFields>
<label>鑰楁潗鍙戣揣_R</label>
</FieldSet>
--
Gitblit v1.9.1