From 0e43bab9d421948c61ca0f79b763942ba9e724a6 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 30 十一月 2022 16:47:51 +0800
Subject: [PATCH] 有些是集采的有些不是是这些文件

---
 force-app/main/default/objects/OPDPlan__c/fields/Is_Satisfied__c.field-meta.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/objects/OPDPlan__c/fields/Is_Satisfied__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/Is_Satisfied__c.field-meta.xml
index b22e589..d6d33bc 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/Is_Satisfied__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/Is_Satisfied__c.field-meta.xml
@@ -4,13 +4,13 @@
     <description>2021.04.23  鏉庢椇淇敼   鈥樺鍝佺姸鎬�1鈥欏瓧娈�
 2021.04.26   鏉庢椇淇敼  瀛楁鍚嶇О 鍜� 鏄剧ず鍊�</description>
     <externalId>false</externalId>
-    <formula>IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;isBlank(Rental_Apply2__c),
+    <formula>IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;isBlank(Rental_Apply2__c),
   &apos;&apos;,
-  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;琚姩鍙栨秷&apos;, 
+  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;琚姩鍙栨秷&apos;, 
   &apos;4.鏈弧瓒�&apos;,
-  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;涓诲姩鍙栨秷&apos;, 
+  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;涓诲姩鍙栨秷&apos;, 
   &apos;&apos;,
-   IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;!isBlank(Bollowdate__c),
+   IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;!isBlank(Bollowdate__c),
     &apos;1.婊¤冻&apos;, 
      IF((TEXT(Status__c)==&apos;鍙栨秷&apos;||TEXT(Status__c)==&apos;璁″垝涓�&apos;)&amp;&amp; TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;琚姩鍙栨秷&apos;,
        &apos;4.鏈弧瓒�&apos;,  

--
Gitblit v1.9.1