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

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/QisSubOrder__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/QisSubOrder__c.field-meta.xml
index c690f40..8d46b7c 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/QisSubOrder__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/QisSubOrder__c.field-meta.xml
@@ -5,7 +5,7 @@
     <externalId>false</externalId>
     <label>QIS鏉ユ簮鎶ヤ慨鍗曞彿</label>
     <referenceTo>RepairSubOrder__c</referenceTo>
-    <relationshipLabel>QIS</relationshipLabel>
+    <relationshipLabel>Qis</relationshipLabel>
     <relationshipName>QisSubOrder</relationshipName>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1