From 3bc46bc67f9fe9d7665f165d7f58ad044308a3c3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期三, 26 四月 2023 16:08:23 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/EquipmentSetShippmentReceived6.page | 5 ++++-
force-app/main/default/pages/RentalReportExport.page | 2 +-
force-app/main/default/pages/FixtureRemind.page | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
index d19f363..26c7383 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
@@ -259,7 +259,10 @@
<tr>
<!-- 鐘舵�佸垏鎹tn -->
<th colspan="2" style="font-size:20px;text-align: center;width:380px;">
- <ul id="Step_tab">
+ <!-- 2023-04-26 zyh lightning鍗囩骇 start -->
+ <!-- <ul id="Step_tab"> -->
+ <ul id="Step_tab" style="margin-left:0px;">
+ <!-- 2023-04-26 zyh lightning鍗囩骇 end -->
<li class="selected"><span class="tabsize">涓婃灦</span></li>
</ul>
</th>
diff --git a/force-app/main/default/pages/FixtureRemind.page b/force-app/main/default/pages/FixtureRemind.page
index 14cffe9..261988c 100644
--- a/force-app/main/default/pages/FixtureRemind.page
+++ b/force-app/main/default/pages/FixtureRemind.page
@@ -1,4 +1,4 @@
-<apex:page controller="FixtureRemindController" action="{!init}" id="allPage">
+<apex:page controller="FixtureRemindController" action="{!init}" id="allPage" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
diff --git a/force-app/main/default/pages/RentalReportExport.page b/force-app/main/default/pages/RentalReportExport.page
index da921b5..dfcae60 100644
--- a/force-app/main/default/pages/RentalReportExport.page
+++ b/force-app/main/default/pages/RentalReportExport.page
@@ -1,4 +1,4 @@
-<apex:page id="page" controller="RentalReportExportController">
+<apex:page id="page" controller="RentalReportExportController" lightningStylesheets="true">
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
--
Gitblit v1.9.1