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/Maintenance_Contract__c/fields/Small_Repair_Time__c.field-meta.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Small_Repair_Time__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Small_Repair_Time__c.field-meta.xml
index 29b9fc3..3c40a66 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Small_Repair_Time__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Small_Repair_Time__c.field-meta.xml
@@ -12,18 +12,36 @@
<valueSetDefinition>
<sorted>false</sorted>
<value>
+ <fullName>5</fullName>
+ <default>false</default>
+ <label>5</label>
+ </value>
+ <value>
+ <fullName>7</fullName>
+ <default>false</default>
+ <label>7</label>
+ </value>
+ <value>
+ <fullName>10</fullName>
+ <default>false</default>
+ <label>10</label>
+ </value>
+ <value>
<fullName>24</fullName>
<default>false</default>
+ <isActive>false</isActive>
<label>24</label>
</value>
<value>
<fullName>48</fullName>
- <default>true</default>
+ <default>false</default>
+ <isActive>false</isActive>
<label>48</label>
</value>
<value>
<fullName>72</fullName>
<default>false</default>
+ <isActive>false</isActive>
<label>72</label>
</value>
</valueSetDefinition>
--
Gitblit v1.9.1