fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 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>