Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/pages/RentalSequenceWatch.page

@@ -1,9 +1,9 @@
<apex:page controller="RentalSequenceWatchController"  showHeader="false" sidebar="false" id="allPage" action="{!init}" title="异常数据查看">
<apex:page controller="RentalSequenceWatchController"  showHeader="false" sidebar="false" id="allPage" action="{!init}" title="异常数据查看" 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/29.0/connection.js"/>
<apex:includeScript value="/soap/ajax/29.0/apex.js"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:form id="allForm">
<apex:outputPanel rendered="{!!haveErrCF_X}">
@@ -35,8 +35,8 @@
        <td><apex:outputText value="{!info.ExternalKey__c}"/></td>
        <td><apex:outputText value="{!info.Series_No__c}"/></td>
    </tr>
   </apex:repeat>
   </tbody>
    </apex:repeat>
    </tbody>
</table>
</apex:outputPanel>
<apex:outputPanel rendered="{!haveErrTH_X}">
@@ -56,8 +56,8 @@
        <td><apex:outputText value="{!info.ExternalKey__c}"/></td>
        <td><apex:outputText value="{!info.Series_No__c}"/></td>
    </tr>
   </apex:repeat>
   </tbody>
    </apex:repeat>
    </tbody>
</table>
</apex:outputPanel>
<apex:outputPanel rendered="{!haveErrCF_D}">
@@ -77,8 +77,8 @@
        <td><apex:outputText value="{!info.ExternalKey__c}"/></td>
        <td><apex:outputText value="{!info.Queue_Number__c}"/></td>
    </tr>
   </apex:repeat>
   </tbody>
    </apex:repeat>
    </tbody>
</table>
</apex:outputPanel>
<apex:outputPanel rendered="{!haveErrTH_D}">
@@ -98,8 +98,8 @@
        <td><apex:outputText value="{!info.ExternalKey__c}"/></td>
        <td><apex:outputText value="{!info.Queue_Number__c}"/></td>
    </tr>
   </apex:repeat>
   </tbody>
    </apex:repeat>
    </tbody>
</table>
</apex:outputPanel>
</apex:form>