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/QIS_Report__c/fields/OCM_quolity_owner__c.field-meta.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/OCM_quolity_owner__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/OCM_quolity_owner__c.field-meta.xml
index 21e45eb..d41db75 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/OCM_quolity_owner__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/OCM_quolity_owner__c.field-meta.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>OCM_quolity_owner__c</fullName>
+    <description>CASE(Province_Text__c, 
+&apos;娌冲寳鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;灞变笢鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;澶╂触甯�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;鍐呰挋鍙�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;鍖椾含甯�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;鍚夋灄鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;榛戦緳姹熺渷&apos;,&apos;涓矝 淇婁箣&apos;,&apos;杈藉畞鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;娌冲崡鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;鐢樿們鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;灞辫タ鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;鏂扮枂鑷不鍖�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;闈掓捣鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;瀹佸鑷不鍖�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;闄曡タ鐪�&apos;,&apos;涓矝 淇婁箣&apos;,&apos;瀹夊窘鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;姹熻タ鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;姹熻嫃鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;涓婃捣甯�&apos;,&apos;鍒� 鏈�&apos;,&apos;绂忓缓鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;娴欐睙鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;娴峰崡鐪�&apos;, &apos;榛勬��蹇�&apos;,&apos;婀栧崡鐪�&apos;,&apos;榛勬��蹇�&apos;, &apos;婀栧寳鐪�&apos;,&apos;榛勬��蹇�&apos;,&apos;骞胯タ鑷不鍖�&apos;,&apos;榛勬��蹇�&apos;,&apos;骞夸笢鐪�&apos;,&apos;榛勬��蹇�&apos;,&apos;浜戝崡鐪�&apos;,&apos;榛勬��蹇�&apos;,&apos;鍥涘窛鐪�&apos;,&apos;榛勬��蹇�&apos;,&apos;閲嶅簡甯�&apos;,&apos;榛勬��蹇�&apos;,&apos;瑗胯棌鑷不鍖�&apos;,&apos;榛勬��蹇�&apos;,&apos;璐靛窞鐪�&apos;,&apos;榛勬��蹇�&apos;,&apos;&apos;)
+2022/07/04鍓嶉�昏緫</description>
     <externalId>false</externalId>
-    <formula>CASE(Province_Text__c, 
-&apos;娌冲寳鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;灞变笢鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;澶╂触甯�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;鍐呰挋鍙�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;鍖椾含甯�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;鍚夋灄鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;榛戦緳姹熺渷&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;杈藉畞鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;娌冲崡鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;鐢樿們鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;灞辫タ鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;鏂扮枂鑷不鍖�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;闈掓捣鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;瀹佸鑷不鍖�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;闄曡タ鐪�&apos;,&apos;鏉戠敯 娲嬩竴&apos;,&apos;瀹夊窘鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;姹熻タ鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;姹熻嫃鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;涓婃捣甯�&apos;,&apos;鍒� 鏈�&apos;,&apos;绂忓缓鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;娴欐睙鐪�&apos;,&apos;鍒� 鏈�&apos;,&apos;娴峰崡鐪�&apos;, &apos;鏉庢槬鏁�&apos;,&apos;婀栧崡鐪�&apos;,&apos;鏉庢槬鏁�&apos;, &apos;婀栧寳鐪�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;骞胯タ鑷不鍖�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;骞夸笢鐪�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;浜戝崡鐪�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;鍥涘窛鐪�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;閲嶅簡甯�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;瑗胯棌鑷不鍖�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;璐靛窞鐪�&apos;,&apos;鏉庢槬鏁�&apos;,&apos;&apos;)</formula>
+    <formula>CASE(OCM_quolity_owner_SN__c,
+&apos;鍖楁柟&apos;,If(DATEVALUE(CreatedDate) &gt;= DATE(2022,4,1),&apos;涓矝 淇婁箣&apos;,&apos;鏉戠敯 娲嬩竴&apos;),
+&apos;鍗庝笢&apos;,If(DATEVALUE(CreatedDate) &gt;DATE(2019,9,30),&apos;鍒� 鏈�&apos;,&apos;姹熷彛 鏅轰篃&apos;),
+&apos;鍗楁柟&apos;,If(DATEVALUE(CreatedDate)&gt;= DATE(2022,6,27),&apos;榛� 鎬�蹇�&apos;,&apos;鏉� 鏄ユ晱&apos;),&apos;&apos;)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>OCSM璐ㄩ噺璐熻矗浜�</label>
     <required>false</required>

--
Gitblit v1.9.1