From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/objects/Repair__c/fields/DOJ_Status__c.field-meta.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/DOJ_Status__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/DOJ_Status__c.field-meta.xml
index dceb22c..9ac0220 100644
--- a/force-app/main/default/objects/Repair__c/fields/DOJ_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/DOJ_Status__c.field-meta.xml
@@ -2,15 +2,15 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>DOJ_Status__c</fullName>
     <description>|| And(ISBLANK(OCSM_RC_CordingUser__c),Contain_UseRSA__c)
-20211012  LJPH-C7L8MX  寮曠敤鍙楀奖鍝嶅瓧娈�</description>
+20211012 LJPH-C7L8MX 寮曠敤鍙楀奖鍝嶅瓧娈�</description>
     <externalId>false</externalId>
     <formula>IF(OR(Status1Text__c=&apos;鑽夋涓�&apos;,Failure_Occurrence_Date__c &lt; DATE(2020,04,20), !Isblank(QIS_ID__c), Status1Text__c=&apos;0.鍒犻櫎&apos;),
 &apos;闈炲璞�&apos;,
 if(And(Status1Text__c=&apos;0.鍙栨秷&apos;,isBlank(Complaint_Number__c),isBlank(Repair_Ordered_Date__c)),
 &apos;闈炲璞�&apos;,
 /* 鍥藉唴閲囪喘鍝佹槸DOJ鐨勯潪瀵硅薄 20201023 gzw */
-/* update by rentx 2020-10-26*/
-if((is_CNBuy__c = &apos;true&apos;),
+/* update by rentx 2020-10-26;Is_Box__c ljh 20220407 闀滅绫讳骇鍝�*/
+if((is_CNBuy__c = &apos;true&apos;|| Is_Box__c  ),
 &apos;闈炲璞�&apos;,
 /* update by rentx 2020-10-23 */
 /* update by rentx 2021-05-07 start*/

--
Gitblit v1.9.1