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

diff --git a/force-app/main/default/objects/Account_Service_Of_Target__c/fields/Finish_Coverage_Asset__c.field-meta.xml b/force-app/main/default/objects/Account_Service_Of_Target__c/fields/Finish_Coverage_Asset__c.field-meta.xml
index f498bab..7b5d7a7 100644
--- a/force-app/main/default/objects/Account_Service_Of_Target__c/fields/Finish_Coverage_Asset__c.field-meta.xml
+++ b/force-app/main/default/objects/Account_Service_Of_Target__c/fields/Finish_Coverage_Asset__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Finish_Coverage_Asset__c</fullName>
     <externalId>false</externalId>
-    <formula>Finish_RigidMirror__c + Finish_SoftMirror__c + Finish_Correlation__c</formula>
+    <formula>Finish_Rigid_Mirror_2__c+ Finish_Correlation_Lightsource__c+ Finish_Rigid_Mirror_1__c</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>瀹為檯瑕嗙洊鏁帮細璁惧鏁�</label>
     <precision>18</precision>

--
Gitblit v1.9.1