From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/pages/TransferShippmentReceived2.page |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/pages/TransferShippmentReceived2.page b/force-app/main/default/pages/TransferShippmentReceived2.page
index f1c3b2d..8b6bcdb 100644
--- a/force-app/main/default/pages/TransferShippmentReceived2.page
+++ b/force-app/main/default/pages/TransferShippmentReceived2.page
@@ -304,6 +304,9 @@
                 </apex:outputPanel>
                 <div class="menu">
                 <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
+                    <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+                    <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+                    <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
                 </div></h2>
                 <!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
                 <!-- 20230718 ljh     -->
@@ -378,10 +381,12 @@
                             <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_After_Inspection_elapsed_days__c.label}锛� </span>
                             <span><apex:outputField value="{!esdInfo.rec.Pre_After_Inspection_elapsed_days__c}" style="margin:3px;width:75px;"/></span>
                         </li>
-                        <li>
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+                        <!-- <li>
                             <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}锛� </span>
                             <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
-                        </li>
+                        </li> -->
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
                         <!-- </div> -->
                     </apex:outputPanel>
                 </ul>

--
Gitblit v1.9.1