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/Inquiry_form__c/fields/Hospital__c.field-meta.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Inquiry_form__c/fields/Hospital__c.field-meta.xml b/force-app/main/default/objects/Inquiry_form__c/fields/Hospital__c.field-meta.xml
index 3999f37..7d0bbfb 100644
--- a/force-app/main/default/objects/Inquiry_form__c/fields/Hospital__c.field-meta.xml
+++ b/force-app/main/default/objects/Inquiry_form__c/fields/Hospital__c.field-meta.xml
@@ -6,8 +6,9 @@
     <label>鍖婚櫌</label>
     <referenceTo>Account</referenceTo>
     <relationshipLabel>浜у搧鍜ㄨ鍗� (鍖婚櫌)</relationshipLabel>
-    <relationshipName>Hospital3a2i</relationshipName>
+    <relationshipName>Hospitalxuxv</relationshipName>
     <required>false</required>
+    <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>
     <type>Lookup</type>
 </CustomField>

--
Gitblit v1.9.1