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

diff --git a/force-app/main/default/objects/Repair__c/fields/Usage_Ratio_Price_Contract__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Usage_Ratio_Price_Contract__c.field-meta.xml
index 6abbfe2..47bbd28 100644
--- a/force-app/main/default/objects/Repair__c/fields/Usage_Ratio_Price_Contract__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Usage_Ratio_Price_Contract__c.field-meta.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Usage_Ratio_Price_Contract__c</fullName>
-    <description>IF(ISBLANK(Repair_Quotation_Id__c),
-0,
-Repair_Quotation_Id__r.Usage_Ratio_Price_Contract__c)</description>
     <externalId>false</externalId>
     <formula>IF(OR( Status2__c = &apos;00.鍒犻櫎&apos;,Status2__c = &apos;00.鍙栨秷&apos;,ISBLANK(Repair_Quotation_Id__c)),
 0,

--
Gitblit v1.9.1