From dec96e2f8b84ea04d773c0c520c39b0822912ee3 Mon Sep 17 00:00:00 2001
From: D C <chenbangcai@prec-tech.com>
Date: 星期五, 26 五月 2023 10:32:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/objects/Inventory_Header__c/fields/Mail_Content_Diff__c.field-meta.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Inventory_Header__c/fields/Mail_Content_Diff__c.field-meta.xml b/force-app/main/default/objects/Inventory_Header__c/fields/Mail_Content_Diff__c.field-meta.xml
index eeb67c6..d965940 100644
--- a/force-app/main/default/objects/Inventory_Header__c/fields/Mail_Content_Diff__c.field-meta.xml
+++ b/force-app/main/default/objects/Inventory_Header__c/fields/Mail_Content_Diff__c.field-meta.xml
@@ -2,7 +2,8 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Mail_Content_Diff__c</fullName>
     <description>纭鏃堕棿涓虹┖鏃讹紝鍙戦�佺粰纭浜虹殑纭閭欢--&apos;璇风‘璁�&apos;锛� 
-纭鏃堕棿涓嶄负绌烘椂锛屽彂閫佺粰瀹℃壒浜虹殑瀹℃壒閭欢--&apos;浠撳簱缁勫凡纭锛岃鎮ㄥ鎵�&apos;銆�</description>
+纭鏃堕棿涓嶄负绌烘椂锛屽彂閫佺粰瀹℃壒浜虹殑瀹℃壒閭欢--&apos;浠撳簱缁勫凡纭锛岃鎮ㄥ鎵�&apos;銆�
+IF ( ISBLANK(Checktime__c) , &apos;璇风‘璁�&apos;, &apos;浠撳簱缁勫凡纭锛岃鎮ㄥ鎵�&apos;)</description>
     <externalId>false</externalId>
     <formula>if(Internal_asset_location__c==&apos;鍖椾含 澶囧搧涓績&apos; || Internal_asset_location__c==&apos;涓婃捣 澶囧搧涓績&apos; || Internal_asset_location__c==&apos;骞垮窞 澶囧搧涓績&apos;,if(ISBLANK(Checktime__c),&apos;璇风‘璁�&apos;, &apos;浠撳簱缁勫凡纭锛岃鎮ㄥ鎵�&apos;),&apos;宸茬‘璁わ紝璇锋偍瀹℃壒&apos;)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>

--
Gitblit v1.9.1