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/ProductURF__c/fields/UFR_Maintenance_Price_Month__c.field-meta.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/ProductURF__c/fields/UFR_Maintenance_Price_Month__c.field-meta.xml b/force-app/main/default/objects/ProductURF__c/fields/UFR_Maintenance_Price_Month__c.field-meta.xml
index 4d62f81..2eb6ad2 100644
--- a/force-app/main/default/objects/ProductURF__c/fields/UFR_Maintenance_Price_Month__c.field-meta.xml
+++ b/force-app/main/default/objects/ProductURF__c/fields/UFR_Maintenance_Price_Month__c.field-meta.xml
@@ -4,7 +4,7 @@
<externalId>false</externalId>
<formula>Maintenance_Price_Year_URF__c / 12</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>缁翠慨鍚堝悓鎶ヤ环锛堟湀锛�</label>
+ <label>2娆缁翠慨鍚堝悓鎶ヤ环锛堟湀锛�</label>
<precision>18</precision>
<required>false</required>
<scale>4</scale>
--
Gitblit v1.9.1