From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexOutboundorderImportController.cls | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/classes/LexOutboundorderImportController.cls b/force-app/main/default/classes/LexOutboundorderImportController.cls
index f09d489..a305d02 100644
--- a/force-app/main/default/classes/LexOutboundorderImportController.cls
+++ b/force-app/main/default/classes/LexOutboundorderImportController.cls
@@ -31,15 +31,7 @@
messageCount = 0;
errorflg = false;
errorMessage = null;
-<<<<<<< HEAD
- User useracc = [
- SELECT accountid, Work_Location__c, UserPro_Type__c
- FROM user
- WHERE id = :UserInfo.getUserId()
- ];
-=======
User useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
->>>>>>> LEXCommunityLiJun
accountid = Useracc.accountid;
userWorkLocation = Useracc.Work_Location__c;
agencyProType = Useracc.UserPro_Type__c;
@@ -188,7 +180,6 @@
//ApexPages.addMessages(e);
errorMsg += e.getMessage() + ' ' + e.getLineNumber() + ';';
//return new ResponseBodyLWC('Error', 500, e.getMessage()+e.getStackTraceString(), '');
-<<<<<<< HEAD
}
getorderinfo();
dataInfoconfim();
@@ -196,15 +187,6 @@
if (saveFLGbln == false) {
getorderdetinfo(csvRecordStr);
}
-=======
- }
- getorderinfo();
- dataInfoconfim();
- getorderdet2info(csvRecordStr);
- if (saveFLGbln == false) {
- getorderdetinfo(csvRecordStr);
- }
->>>>>>> LEXCommunityLiJun
data.put('orderRecords', orderRecords);
data.put('saveFLGbln', saveFLGbln);
data.put('csvRecordStr', csvRecordStr);
@@ -933,8 +915,4 @@
return null;
}
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1