Merge branch 'master' into LightningUpgradeProject

buli

2023-06-05 e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f

 force-app/main/default/objects/Tender_information__c/fields/IsBid__c.field-meta.xml

@@ -12,15 +12,14 @@
        <valueSetDefinition>
            <sorted>false</sorted>
            <value>
                <fullName>是</fullName>
                <default>false</default>
                <label>是</label>
            </value>
            <value>
                <fullName>否</fullName>
                <default>false</default>
                <label>否</label>
            </value>
            <value>
                <fullName>是</fullName>
                <default>false</default>
                <isActive>false</isActive>
                <label>是</label>
            </value>
        </valueSetDefinition>
    </valueSet>