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/Repair__c/fields/RepairSource_Txt__c.field-meta.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/RepairSource_Txt__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/RepairSource_Txt__c.field-meta.xml
index b512e09..38445e2 100644
--- a/force-app/main/default/objects/Repair__c/fields/RepairSource_Txt__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/RepairSource_Txt__c.field-meta.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>RepairSource_Txt__c</fullName>
-    <description>鐘舵��1=鍙楃悊瀹屾瘯锛岀姸鎬�2=01.鍒嗗叕鍙稿彈鐞嗗畬姣� 鏃讹紝淇濆瓨&quot;淇悊鏉ユ簮(鏅��/澶囧搧/QIS)&quot; 鐨勫��</description>
+    <description>鐘舵��1=鍙楃悊瀹屾瘯锛岀姸鎬�2=01.鍒嗗叕鍙稿彈鐞嗗畬姣� 鏃讹紝淇濆瓨&quot;淇悊鏉ユ簮(鏅��/澶囧搧/QIS)&quot; 鐨勫��
+---------------------------------------------------------
+鏃犱娇鐢紝鍒犻櫎</description>
     <externalId>false</externalId>
-    <label>淇悊鏉ユ簮(鏅��/澶囧搧/QIS)(鏂囨湰)</label>
+    <label>***淇悊鏉ユ簮(鏅��/澶囧搧/QIS)(鏂囨湰)</label>
     <length>20</length>
     <required>false</required>
     <trackFeedHistory>false</trackFeedHistory>

--
Gitblit v1.9.1