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/Tender_Opportunity_Link__c/fields/Opportunity__c.field-meta.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/Opportunity__c.field-meta.xml b/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/Opportunity__c.field-meta.xml
index 6071d54..695bac9 100644
--- a/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/Opportunity__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_Opportunity_Link__c/fields/Opportunity__c.field-meta.xml
@@ -4,9 +4,9 @@
<externalId>false</externalId>
<label>璇环</label>
<referenceTo>Opportunity</referenceTo>
- <relationshipLabel>鎷涙爣-璇环鍏崇郴</relationshipLabel>
+ <relationshipLabel>鎷涙爣-璇环鍏宠仈</relationshipLabel>
<relationshipName>Opportunity_Link</relationshipName>
- <relationshipOrder>0</relationshipOrder>
+ <relationshipOrder>1</relationshipOrder>
<reparentableMasterDetail>false</reparentableMasterDetail>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
--
Gitblit v1.9.1