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/EquipmentSetShippmentReceived6.page | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
index 788699e..04acdc4 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
@@ -1,4 +1,4 @@
-<apex:page Controller="EquipmentSetShippmentReceived6Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="澶囧搧鍑哄簱鍏ュ簱">
+<apex:page Controller="EquipmentSetShippmentReceived6Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="澶囧搧鍑哄簱鍏ュ簱" lightningStylesheets="true">
<head>
<meta name="format-detection" content="telephone=no"/>
</head>
@@ -408,15 +408,7 @@
<li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
- <!--154P 1414 20211014 yc start -->
- <li>
- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Rental_Apply__r.RecordTypeId=='01210000000RHIiAAO'}">
- <span>澶囧搧鍒嗙被锛�</span>
- <span><apex:outputField value="{!esdInfo.rec.Equipment_Type_text__c}" style="margin:3px;width:75px;"/></span>
- </apex:outputPanel>
- </li>
- <!-- 154P 1414 20211014 yc end-->
+ </li>
<!-- </apex:outputPanel> -->
<!-- </div> -->
</ul>
--
Gitblit v1.9.1