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/ProcessInstance.page |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/pages/ProcessInstance.page b/force-app/main/default/pages/ProcessInstance.page
index dc9baee..4507dfd 100644
--- a/force-app/main/default/pages/ProcessInstance.page
+++ b/force-app/main/default/pages/ProcessInstance.page
@@ -1,4 +1,4 @@
-<apex:page controller="ProcessInstanceSolController" tabStyle="Solution_Programme__c">
+<apex:page controller="ProcessInstanceSolController" tabStyle="Solution_Programme__c"  lightningstylesheets="true" lightningStylesheets="true">
    <script type="text/javascript">
    		function checkapp() {
    			// body...
@@ -40,7 +40,7 @@
                <apex:pageMessages />
            </apex:pageBlockSectionItem>
            <apex:pageBlockSectionItem >
-               鏂规鍚嶇О <apex:outputField value="{!objSol.Name}"/>
+               鏂规鍚嶇О <apex:outputField value="{!objSol.Name}"/><!-- rendered="{!IF(testlink == '姝ラ锛氭祴璇曪紙绛夊緟澶勭悊鐨�+棣栧厛+鎵瑰噯锛�', 'true', 'false')}" -->
            </apex:pageBlockSectionItem>
            <!-- <apex:pageBlockSectionItem >
                Lead Owner <apex:outputField value="{!objSol.Owner.Name}"/>
@@ -49,7 +49,7 @@
                纭缁撴灉(鍗曢��) <font color="red">(蹇呭~)</font><apex:inputField id="ConResult" value="{!objSol.Confirmation_Result__c}"/>
            </apex:pageBlockSectionItem>
            <apex:pageBlockSectionItem >
-               澶囨敞 <font color="red"></font><apex:inputField value="{!objSol.Remarks__c}"/>
+               澶囨敞 <font color="red"></font><apex:inputField value="{!objSol.Remarks__c}"/> <!--  rendered="{!IF(testlink == '姝ラ锛氭楠� 1锛堢瓑寰呭鐞嗙殑 棣栧厛 鎵瑰噯锛�', 'false', 'true')}"  -->
            </apex:pageBlockSectionItem>
            <apex:pageBlockSectionItem >
               璇勮 <font color="red"></font> <apex:inputTextArea value="{!Comments}" rows="5" cols="100"/>

--
Gitblit v1.9.1