Merge branch 'master' into LightningUpgradeProject

buli

2023-06-05 e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f

 force-app/main/default/objects/meeting_delay_apply__c/fields/Meeting_Cooperate1_Old__c.field-meta.xml

@@ -7,7 +7,6 @@
    <trackTrending>false</trackTrending>
    <type>Picklist</type>
    <valueSet>
        <restricted>true</restricted>
        <valueSetDefinition>
            <sorted>false</sorted>
            <value>
@@ -68,13 +67,7 @@
            <value>
                <fullName>消化.呼吸领域解决方案本部</fullName>
                <default>false</default>
                <label>消化.呼吸领域解决方案本部</label>
            </value>
            <value>
                <fullName>能量事业本部</fullName>
                <default>false</default>
                <isActive>false</isActive>
                <label>能量事业本部</label>
                <label>Solution本部</label>
            </value>
        </valueSetDefinition>
    </valueSet>