From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001 From: buli <137736985@qq.com> Date: 星期一, 05 六月 2023 11:22:08 +0800 Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject --- force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Current_Price_Should__c.field-meta.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Current_Price_Should__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Current_Price_Should__c.field-meta.xml index 9028e0f..029e652 100644 --- a/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Current_Price_Should__c.field-meta.xml +++ b/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Current_Price_Should__c.field-meta.xml @@ -2,7 +2,9 @@ <CustomField xmlns="http://soap.sforce.com/2006/04/metadata"> <fullName>Current_Price_Should__c</fullName> <externalId>false</externalId> - <formula>IF(Adjustment_ratio_Upper__c <0,"1.搴旇闄嶄环",IF(AND(Adjustment_ratio_Lower__c >=0,Adjustment_ratio_Upper__c <=5),"2.搴旇缁存寔","3.搴旇娑ㄤ环"))</formula> + <formula>IF(Adjustment_ratio_Upper__c <0,"1.搴旇闄嶄环", +IF( Adjustment_ratio_Lower__c >0.05,"3.搴旇娑ㄤ环","2.搴旇缁存寔") +)</formula> <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs> <label>鏈湡浠锋牸搴旇</label> <required>false</required> -- Gitblit v1.9.1