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/pages/RentalApplyQR.page |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/pages/RentalApplyQR.page b/force-app/main/default/pages/RentalApplyQR.page
index f5098ea..d6ec2e1 100644
--- a/force-app/main/default/pages/RentalApplyQR.page
+++ b/force-app/main/default/pages/RentalApplyQR.page
@@ -1,9 +1,7 @@
 <apex:page standardController="Rental_Apply__c">
     <apex:includeScript value="{!URLFOR($Resource.qrcode)}"/>
-<!--     <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/> -->
-    <apex:includeScript value="/soap/ajax/40.0/connection.js"/>
-    <apex:includeScript value="/soap/ajax/40.0/apex.js"/>
+    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
 
     <div id="qrcode"></div>
     <script type="text/javascript">
@@ -12,6 +10,7 @@
             var img = div.getElementsByTagName("img");
             var src = img[0].src;
             src = src.substring(22, src.length);
+
             sforce.connection.sessionId = '{!GETSESSIONID()}';
 
             var record = sforce.connection.query("select id from Attachment where ParentId = \'{!Rental_Apply__c.Id}\' and name = \'QRCode-{!Rental_Apply__c.Name}\'");

--
Gitblit v1.9.1