fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/Repair__c/fields/UseFailProductFinish__c.field-meta.xml

@@ -33,6 +33,12 @@
                <default>false</default>
                <label>否-手术中止</label>
            </value>
            <value>
                <fullName>undefined</fullName>
                <default>false</default>
                <isActive>false</isActive>
                <label>undefined</label>
            </value>
        </valueSetDefinition>
    </valueSet>
</CustomField>