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/Consum_Apply__c/webLinks/returnDeliverySlip.webLink-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Consum_Apply__c/webLinks/returnDeliverySlip.webLink-meta.xml b/force-app/main/default/objects/Consum_Apply__c/webLinks/returnDeliverySlip.webLink-meta.xml
index 927520a..4f7146f 100644
--- a/force-app/main/default/objects/Consum_Apply__c/webLinks/returnDeliverySlip.webLink-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/webLinks/returnDeliverySlip.webLink-meta.xml
@@ -10,7 +10,7 @@
     <protected>false</protected>
     <url>{!REQUIRESCRIPT(&quot;/soap/ajax/51.0/connection.js&quot;)};
 {!REQUIRESCRIPT(&quot;/soap/ajax/51.0/apex.js&quot;)};
-//2021-10-22 gwy 鐗堟湰鏇存敼涓�51.0
+
 function foo(){
     var query = &quot;SELECT Asset_Center_Confirm_F__c FROM Consum_Apply_Equipment_Set_Detail__c WHERE Cancel_Select__c = false AND Consum_Apply__c =&apos;{!Consum_Apply__c.Id}&apos;&quot;;
     var records = sforce.connection.query(query).getArray(&apos;records&apos;);

--
Gitblit v1.9.1