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/LostReportEditAsset.page | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/LostReportEditAsset.page b/force-app/main/default/pages/LostReportEditAsset.page
index 9bdfd1c..012a452 100644
--- a/force-app/main/default/pages/LostReportEditAsset.page
+++ b/force-app/main/default/pages/LostReportEditAsset.page
@@ -1,9 +1,9 @@
-<apex:page standardController="LostReport__c" extensions="LostReportEditAssetController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page standardController="LostReport__c" extensions="LostReportEditAssetController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="/soap/ajax/46.0/connection.js"/>
-<apex:includeScript value="/soap/ajax/46.0/apex.js"/>
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<style>
.dateFormat {
display: none;
@@ -518,7 +518,7 @@
<table class="inventoryReportTable" style="width: 100%;margin-top: 0px; margin-bottom: 0px;">
<col style="width: 100%;" />
<tr>
- <td class="topb2 leftb2 rightb2">缁忕悊锛�</td>
+ <td class="topb2 leftb2 rightb2">CL6 缁忕悊绾�:</td>
</tr>
<tr>
<td class="leftb2 rightb2">
@@ -533,7 +533,7 @@
</td>
</tr>
<tr>
- <td class="topb leftb2 rightb2">閮ㄩ暱锛� </td>
+ <td class="topb leftb2 rightb2">CL5 鎬荤洃绾э細 </td>
</tr>
<tr>
<td class="leftb2 rightb2">
@@ -548,7 +548,7 @@
</td>
</tr>
<tr>
- <td class="topb leftb2 rightb2">缁熸嫭鎬荤洃锛堟�荤洃锛夛細 </td>
+ <td class="topb leftb2 rightb2">CL3 鍓�昏锛圕L4 楂樼骇鎬荤洃锛夛細 </td>
</tr>
<tr>
<td class="leftb2 rightb2">
@@ -636,7 +636,7 @@
<td class="topb2 leftb2 rightb2 bottomb center" colspan="5">澶囧搧浣跨敤娉ㄦ剰浜嬮」</td>
</tr>
<tr>
- <td class="leftb2 rightb2 bottomb left" colspan="5">1銆佸綋鍙戠敓鍥哄畾璧勪骇閬楀け銉荤洏浜忔儏鍐垫椂锛岀敵璇蜂汉椤诲～鍐欐湰銆婂浐瀹氳祫浜ч仐澶便兓鐩樹簭鎶ュ憡銆嬶紝閫愮骇鍚戞墍灞為儴闂ㄩ瀵兼眹鎶ワ紝骞跺彇寰楃粺鎷�荤洃鎵瑰噯銆�</td>
+ <td class="leftb2 rightb2 bottomb left" colspan="5">1銆佸綋鍙戠敓鍥哄畾璧勪骇閬楀け銉荤洏浜忔儏鍐垫椂锛岀敵璇蜂汉椤诲～鍐欐湰銆婂浐瀹氳祫浜ч仐澶便兓鐩樹簭鎶ュ憡銆嬶紝閫愮骇鍚戞墍灞為儴闂ㄩ瀵兼眹鎶ワ紝骞跺彇寰桟L3 鍓�昏鎵瑰噯銆�</td>
</tr>
<tr>
<td class="leftb2 rightb2 bottomb left" colspan="5">2銆佸浜庨仐澶辨垨鐩樹簭鐨勫浐瀹氳祫浜х敱鍏徃鍋氬嚭鏈�鍚庡鐞嗗喅瀹氥��</td>
--
Gitblit v1.9.1