From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/objects/Consum_Apply__c/fields/requestNoJoinStr1__c.field-meta.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/Consum_Apply__c/fields/requestNoJoinStr1__c.field-meta.xml b/force-app/main/default/objects/Consum_Apply__c/fields/requestNoJoinStr1__c.field-meta.xml
index 25f1aca..d094365 100644
--- a/force-app/main/default/objects/Consum_Apply__c/fields/requestNoJoinStr1__c.field-meta.xml
+++ b/force-app/main/default/objects/Consum_Apply__c/fields/requestNoJoinStr1__c.field-meta.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>requestNoJoinStr1__c</fullName>
- <description>text( CreatedBy.Province__c )</description>
+ <description>text( CreatedBy.Province__c )
+update lxy 2022/11/17 DB202211326520 娑堝寲路鍛煎惛棰嗗煙瑙e喅鏂规鏈儴宸叉洿鍚嶄负SOLUTION鏈儴,瀵瑰簲鐨勭紪鐮佺敱EP璋冩暣涓篠L</description>
<externalId>false</externalId>
<formula>IF(TEXT(Owner:User.Dept__c) ="鑳介噺浜嬩笟鏈儴","EN",
IF(TEXT(Owner:User.Dept__c) ="鍖荤枟浜у搧鍩硅鏈儴","CP",
@@ -11,7 +12,7 @@
IF(TEXT(Owner:User.Dept__c) ="鍖荤枟澶囧搧绠$悊涓績","BP",
IF(TEXT(Owner:User.Dept__c) ="鍖荤枟鏈嶅姟鏈儴","FW",
IF(TEXT(Owner:User.Dept__c) ="甯傚満浼佸垝鏈儴","MP",
-IF(TEXT(Owner:User.Dept__c) ="娑堝寲路鍛煎惛棰嗗煙瑙e喅鏂规鏈儴","EP",
+IF(TEXT(Owner:User.Dept__c) ="娑堝寲路鍛煎惛棰嗗煙瑙e喅鏂规鏈儴","SL",
Case(text(Owner:User.Province__c),
"瀹夊窘鐪�","HD",
"鍖椾含甯�","HB",
--
Gitblit v1.9.1