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

diff --git a/force-app/main/default/objects/SS_OPDPlan__c/fields/SSIsSaveOrSubmit_Specify__c.field-meta.xml b/force-app/main/default/objects/SS_OPDPlan__c/fields/SSIsSaveOrSubmit_Specify__c.field-meta.xml
index b8fff55..0314ec6 100644
--- a/force-app/main/default/objects/SS_OPDPlan__c/fields/SSIsSaveOrSubmit_Specify__c.field-meta.xml
+++ b/force-app/main/default/objects/SS_OPDPlan__c/fields/SSIsSaveOrSubmit_Specify__c.field-meta.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>SSIsSaveOrSubmit_Specify__c</fullName>
+    <description>20210701 鏉庢椇鍒涘缓
+璇鹃锛欳HAN-C4AEYG</description>
     <externalId>false</externalId>
     <formula>IF( SSOPDLendSort__c = SSOPDPlan__r.OPDLendSort__c &amp;&amp;(!ISBLANK(SSOPDLendSort__c) &amp;&amp; !ISBLANK(SSOPDPlan__r.OPDLendSort__c)),&apos;鍑嗘椂鎻愪氦&apos;, &apos;鏈噯鏃舵彁浜�&apos;)</formula>
     <label>OPD鎺掑簭鐘舵�侊紙缁嗗寲锛�</label>

--
Gitblit v1.9.1