From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/objects/Account_Number_of_case__c/fields/OCM_Period__c.field-meta.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Account_Number_of_case__c/fields/OCM_Period__c.field-meta.xml b/force-app/main/default/objects/Account_Number_of_case__c/fields/OCM_Period__c.field-meta.xml
index caa1768..833a8a5 100644
--- a/force-app/main/default/objects/Account_Number_of_case__c/fields/OCM_Period__c.field-meta.xml
+++ b/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>
--
Gitblit v1.9.1