fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/objects/Agency_Opportunity__c/fields/Fund_Basis__c.field-meta.xml

@@ -43,6 +43,11 @@
                <label>融资租赁（リース）</label>
            </value>
            <value>
                <fullName>贴息贷款</fullName>
                <default>false</default>
                <label>贴息贷款</label>
            </value>
            <value>
                <fullName>その他</fullName>
                <default>false</default>
                <label>その他</label>