fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/RepairAgainAn__c/fields/RepairAgain_Status__c.field-meta.xml

@@ -17,9 +17,14 @@
                <label>草案中</label>
            </value>
            <value>
                <fullName>FSE填写完毕</fullName>
                <fullName>RC填写完毕</fullName>
                <default>false</default>
                <label>FSE填写完毕</label>
                <label>RC填写完毕</label>
            </value>
            <value>
                <fullName>OSH受理</fullName>
                <default>false</default>
                <label>OSH受理</label>
            </value>
            <value>
                <fullName>OSH填写完毕</fullName>