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

diff --git a/force-app/main/default/objects/Report__c/fields/Key_product2_wave__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Key_product2_wave__c.field-meta.xml
index 98a9397..c87b540 100644
--- a/force-app/main/default/objects/Report__c/fields/Key_product2_wave__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Key_product2_wave__c.field-meta.xml
@@ -3,7 +3,7 @@
     <fullName>Key_product2_wave__c</fullName>
     <externalId>false</externalId>
     <formula>if(!isBlank(Product2__c) &amp;&amp; isBlank(Product2__r.Key_Product_Txt__c),&apos;鍏朵粬浜у搧&apos;,Product2__r.Key_Product_Txt__c)</formula>
-    <label>閲嶇偣浜у搧鍖哄垎2</label>
+    <label>鎴樼暐浜у搧鍖哄垎2</label>
     <required>false</required>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>

--
Gitblit v1.9.1