fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/Account_Number_of_case__c/fields/OCM_Period__c.field-meta.xml

@@ -97,6 +97,18 @@
            <valueName>152P</valueName>
        </valueSettings>
        <valueSettings>
            <controllingFieldValue>2020年度</controllingFieldValue>
            <valueName>153P</valueName>
        </valueSettings>
        <valueSettings>
            <controllingFieldValue>2021年度</controllingFieldValue>
            <valueName>154P</valueName>
        </valueSettings>
        <valueSettings>
            <controllingFieldValue>2022年度</controllingFieldValue>
            <valueName>155P</valueName>
        </valueSettings>
        <valueSettings>
            <controllingFieldValue>2009年度</controllingFieldValue>
            <valueName>142P</valueName>
        </valueSettings>