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/ReceivingNoteDetail__c/validationRules/Main_Fields_Cannot_Blank.validationRule-meta.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/ReceivingNoteDetail__c/validationRules/Main_Fields_Cannot_Blank.validationRule-meta.xml b/force-app/main/default/objects/ReceivingNoteDetail__c/validationRules/Main_Fields_Cannot_Blank.validationRule-meta.xml
index c6ddaaa..67f4a2e 100644
--- a/force-app/main/default/objects/ReceivingNoteDetail__c/validationRules/Main_Fields_Cannot_Blank.validationRule-meta.xml
+++ b/force-app/main/default/objects/ReceivingNoteDetail__c/validationRules/Main_Fields_Cannot_Blank.validationRule-meta.xml
@@ -2,7 +2,8 @@
 <ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Main_Fields_Cannot_Blank</fullName>
     <active>true</active>
-    <description>涓绘満鏁版嵁纭鏃讹紝銆愬鍝佺鐞嗙紪鐮併�戙�愭墍鍦ㄥ湴鍖�(鏈儴)銆戙�愭墍鍦ㄥ湴鍖�(鐪�)銆戙�愪骇鍝佸垎绫汇�戙�愬鍝佸垎绫汇�戙�愮鐞嗙绫汇�戜负蹇呭～椤�</description>
+    <description>涓绘満鏁版嵁纭鏃讹紝銆愬鍝佺鐞嗙紪鐮併�戙�愭墍鍦ㄥ湴鍖�(鏈儴)銆戙�愭墍鍦ㄥ湴鍖�(鐪�)銆戙�愪骇鍝佸垎绫汇�戙�愬鍝佸垎绫汇�戙�愮鐞嗙绫汇�戜负蹇呭～椤�
+update  lxy 2021/10/14 娣诲姞&amp;&amp; !BEGINS( ReceivingNote__r.ReceivingNoteNo_New__c , &apos;ZZ&apos;)</description>
     <errorConditionFormula>DataMigration_Flag__c == false 
 &amp;&amp; DataConfirmation__c = true
 &amp;&amp; ISPICKVAL(Loaner_accsessary__c,&apos;FALSE&apos;)

--
Gitblit v1.9.1