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

diff --git a/force-app/main/default/objects/Tender_information__c/fields/TenderManageCode__c.field-meta.xml b/force-app/main/default/objects/Tender_information__c/fields/TenderManageCode__c.field-meta.xml
index cc2b78a..c3ade65 100644
--- a/force-app/main/default/objects/Tender_information__c/fields/TenderManageCode__c.field-meta.xml
+++ b/force-app/main/default/objects/Tender_information__c/fields/TenderManageCode__c.field-meta.xml
@@ -3,7 +3,7 @@
     <fullName>TenderManageCode__c</fullName>
     <description>缂栫爜瑙勫垯涓哄勾/鏈�/鏃ュ姞鑷姩缂栧彿</description>
     <externalId>false</externalId>
-    <label>鎷涙姇鏍囬」鐩紪鐮�</label>
+    <label>SFDC缂栫爜</label>
     <length>15</length>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1