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/ASEActivity__c/fields/WorkDesc__c.field-meta.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/ASEActivity__c/fields/WorkDesc__c.field-meta.xml b/force-app/main/default/objects/ASEActivity__c/fields/WorkDesc__c.field-meta.xml
index 78b1305..9a19a8e 100644
--- a/force-app/main/default/objects/ASEActivity__c/fields/WorkDesc__c.field-meta.xml
+++ b/force-app/main/default/objects/ASEActivity__c/fields/WorkDesc__c.field-meta.xml
@@ -3,8 +3,9 @@
<fullName>WorkDesc__c</fullName>
<externalId>false</externalId>
<label>宸ヤ綔鎻忚堪</label>
- <required>false</required>
+ <length>131072</length>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
- <type>TextArea</type>
+ <type>LongTextArea</type>
+ <visibleLines>3</visibleLines>
</CustomField>
--
Gitblit v1.9.1