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

diff --git a/force-app/main/default/objects/QuoteIrai__c/fields/EditLink__c.field-meta.xml b/force-app/main/default/objects/QuoteIrai__c/fields/EditLink__c.field-meta.xml
index 67db610..09fd58a 100644
--- a/force-app/main/default/objects/QuoteIrai__c/fields/EditLink__c.field-meta.xml
+++ b/force-app/main/default/objects/QuoteIrai__c/fields/EditLink__c.field-meta.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>EditLink__c</fullName>
+    <description>2022-10-24澧炲姞鐩稿叧瀵硅薄鐨処D鍙傛暟</description>
     <externalId>false</externalId>
-    <formula>HYPERLINK(&quot;/apex/NewQuoteIrai?Id=&quot; + Id
-  , &quot;缂栭泦(閾炬帴)&quot;
+    <formula>HYPERLINK(&quot;/apex/NewQuoteIrai?Id=&quot; + Id + IF( ISBLANK(Opportunity__c),&apos;&apos;,&apos;&amp;oppid=&apos; + Opportunity__c ) + IF( ISBLANK(Lead__c),&apos;&apos;,&apos;&amp;leadid=&apos; + Lead__c ) + IF( ISBLANK(Tender_information__c),&apos;&apos;,&apos;&amp;tenderid=&apos; + Tender_information__c ) , &quot;鎶ヤ环濮旀墭閾炬帴&quot;
 )</formula>
-    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>缂栭泦(閾炬帴)</label>
+    <label>鎶ヤ环濮旀墭閾炬帴</label>
     <required>false</required>
     <trackTrending>false</trackTrending>
     <type>Text</type>

--
Gitblit v1.9.1