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

diff --git a/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Product_Name_Check_Text__c.field-meta.xml b/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Product_Name_Check_Text__c.field-meta.xml
index 85f6d33..e24ddb2 100644
--- a/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Product_Name_Check_Text__c.field-meta.xml
+++ b/force-app/main/default/objects/ReceivingNoteDetail__c/fields/Product_Name_Check_Text__c.field-meta.xml
@@ -5,6 +5,7 @@
     <label>鍖荤枟鍣ㄦ鍚嶇О妫�娴嬪��</label>
     <length>255</length>
     <required>false</required>
+    <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>
     <type>Text</type>
     <unique>false</unique>

--
Gitblit v1.9.1