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/LexArriveGoodsMainController.cls | 38 --------------------------------------
1 files changed, 0 insertions(+), 38 deletions(-)
diff --git a/force-app/main/default/classes/LexArriveGoodsMainController.cls b/force-app/main/default/classes/LexArriveGoodsMainController.cls
index 0650026..3e7d7cf 100644
--- a/force-app/main/default/classes/LexArriveGoodsMainController.cls
+++ b/force-app/main/default/classes/LexArriveGoodsMainController.cls
@@ -187,7 +187,6 @@
return results;
}
-<<<<<<< HEAD
public class Results {
@AuraEnabled
public String result;
@@ -223,40 +222,3 @@
public Boolean isNoteStay;
}
}
-=======
- public class Results {
- @AuraEnabled
- public String result;
- @AuraEnabled
- public String errorMsg;
- @AuraEnabled
- public String agencyProType;
- @AuraEnabled
- public String category1;
- @AuraEnabled
- public Date cate2;
- @AuraEnabled
- public String eSetId;
- @AuraEnabled
- public String accountId;
- @AuraEnabled
- public List<String> title;
- @AuraEnabled
- public List<Consumable_order__c> raesList;
- @AuraEnabled
- public String userWorkLocation;
- @AuraEnabled
- public Integer totalNum;
- @AuraEnabled
- public Integer orderNumberArrived;
- @AuraEnabled
- public Integer deliveryDetailCount;
- @AuraEnabled
- public Integer orderNumberNotarrive;
- @AuraEnabled
- public Integer moreThanSevenDays;
- @AuraEnabled
- public Boolean isNoteStay;
- }
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1