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

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractAmortizedTurnover_Inquiry__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractAmortizedTurnover_Inquiry__c.field-meta.xml
index 05f1370..e955c9a 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractAmortizedTurnover_Inquiry__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/ContractAmortizedTurnover_Inquiry__c.field-meta.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>ContractAmortizedTurnover_Inquiry__c</fullName>
-    <description>LJPH-C9ABJB</description>
     <externalId>false</externalId>
-    <formula>IF(Contract_Range__c&lt;&gt; 0 ,TotalContractAmortizationAmount_Inquiry__c/Contract_Range__c*   Months_amortized_Inquiry__c  
+    <formula>IF( Contract_Period__c &lt;&gt; 0 ,TotalContractAmortizationAmount_Inquiry__c/Contract_Period__c* Months_amortized_Inquiry__c
 ,0)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鍚堝悓鐨勫凡鎽婅惀涓氶锛堝叕寮忥級</label>

--
Gitblit v1.9.1