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/Lost_cancel_report__c/fields/Cancel_Reason__c.field-meta.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/objects/Lost_cancel_report__c/fields/Cancel_Reason__c.field-meta.xml b/force-app/main/default/objects/Lost_cancel_report__c/fields/Cancel_Reason__c.field-meta.xml
index 320d3b2..150cae2 100644
--- a/force-app/main/default/objects/Lost_cancel_report__c/fields/Cancel_Reason__c.field-meta.xml
+++ b/force-app/main/default/objects/Lost_cancel_report__c/fields/Cancel_Reason__c.field-meta.xml
@@ -17,7 +17,7 @@
<value>
<fullName>璐拱璁″垝鏆傜紦</fullName>
<default>false</default>
- <label>璐拱璁″垝鏆傜紦</label>
+ <label>璐拱璁″垝鍙栨秷</label>
</value>
<value>
<fullName>鍖婚櫌浜轰簨鍙樺姩</fullName>
@@ -27,7 +27,7 @@
<value>
<fullName>鍖婚櫌璧勯噾绱у紶</fullName>
<default>false</default>
- <label>鍖婚櫌璧勯噾绱у紶</label>
+ <label>棰勭畻鍙栨秷</label>
</value>
<value>
<fullName>璁″垝鏈幏瀹℃壒</fullName>
@@ -35,15 +35,15 @@
<label>璁″垝鏈幏瀹℃壒</label>
</value>
<value>
- <fullName>鍏朵粬</fullName>
- <default>false</default>
- <label>鍏朵粬</label>
- </value>
- <value>
<fullName>閲囪喘浜у搧鍋滀骇</fullName>
<default>false</default>
<label>閲囪喘浜у搧鍋滀骇</label>
</value>
+ <value>
+ <fullName>杩涘彛璁鸿瘉褰卞搷</fullName>
+ <default>false</default>
+ <label>杩涘彛璁鸿瘉褰卞搷</label>
+ </value>
</valueSetDefinition>
</valueSet>
</CustomField>
--
Gitblit v1.9.1