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/Rental_Apply__c/fields/Approved_State_Create__c.field-meta.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Approved_State_Create__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Approved_State_Create__c.field-meta.xml
index 68b289b..012079e 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Approved_State_Create__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Approved_State_Create__c.field-meta.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Approved_State_Create__c</fullName>
+ <description>浠巓pd璁″垝鍒涘缓鏃惰祴鍊�</description>
<externalId>false</externalId>
- <label>鍐宠鐘舵�侊紙鍒涘缓鏃讹級</label>
+ <label>鍐宠鐘舵�侊紙鐢宠鏃讹級</label>
<length>255</length>
<required>false</required>
<trackHistory>false</trackHistory>
--
Gitblit v1.9.1