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/engineerSendDate__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/engineerSendDate__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/engineerSendDate__c.field-meta.xml
index eeca4b3..d19d8d9 100644
--- a/force-app/main/default/objects/Repair__c/fields/engineerSendDate__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/engineerSendDate__c.field-meta.xml
@@ -7,5 +7,5 @@
     <trackFeedHistory>false</trackFeedHistory>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>
-    <type>Date</type>
+    <type>DateTime</type>
 </CustomField>

--
Gitblit v1.9.1