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/OPDPlan__c/fields/SalesdepartmentOption__c.field-meta.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/OPDPlan__c/fields/SalesdepartmentOption__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/SalesdepartmentOption__c.field-meta.xml
index 7a69b85..30b8a64 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/SalesdepartmentOption__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/SalesdepartmentOption__c.field-meta.xml
@@ -78,9 +78,9 @@
<label>甯傚満浼佸垝鏈儴</label>
</value>
<value>
- <fullName>娑堝寲鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴</fullName>
+ <fullName>娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴</fullName>
<default>false</default>
- <label>娑堝寲鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴</label>
+ <label>Solution鏈儴</label>
</value>
</valueSetDefinition>
</valueSet>
--
Gitblit v1.9.1