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/OPDPlan__c/fields/Status__c.field-meta.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/OPDPlan__c/fields/Status__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/Status__c.field-meta.xml
index b247703..cbea4a9 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/Status__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/Status__c.field-meta.xml
@@ -54,6 +54,7 @@
</value>
<value>
<fullName>寰呮彁浜ゆ姤鍛�</fullName>
+ <color>#009900</color>
<default>false</default>
<label>6.寰呮彁浜ゆ姤鍛�</label>
</value>
--
Gitblit v1.9.1