From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/objects/Maintenance_Contract__c/fields/Current_price_should_be__c.field-meta.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Current_price_should_be__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Current_price_should_be__c.field-meta.xml
index f1ab8c0..2d1e38f 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Current_price_should_be__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Current_price_should_be__c.field-meta.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Current_price_should_be__c</fullName>
+    <description>IF(Highest_price_adjustment__c&lt;0,&quot;1.搴旇闄嶄环&quot;,IF(AND(Lowest_pricing__c&gt;=0,	Highest_price_adjustment__c&lt;=5),&quot;2.搴旇缁存寔&quot;,&quot;3.搴旇娑ㄤ环&quot;))</description>
     <externalId>false</externalId>
-    <formula>IF(Count_Adjustment_Upper_price__c&lt;0,&quot;1.搴旇闄嶄环&quot;,IF(AND(Couont_Adjustment_Lower_price__c&gt;=0,	Count_Adjustment_Upper_price__c&lt;=5),&quot;2.搴旇缁存寔&quot;,&quot;3.搴旇娑ㄤ环&quot;))</formula>
+    <formula>if(Highest_price_adjustment__c &lt; 0, &quot;1.搴旇闄嶄环&quot;,
+   if(Lowest_pricing__c &gt; 0.05, &quot;3.搴旇娑ㄤ环&quot;, &quot;2.搴旇缁存寔&quot;))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鏈湡浠锋牸搴旇</label>
     <required>false</required>

--
Gitblit v1.9.1