fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/classes/LexArriveGoodsMainController.cls

@@ -35,7 +35,11 @@
            // coc = new Consumable_order__c();
            String userId = UserInfo.getUserId();
            List<user> Useracc = new List<user>();
            Useracc = [SELECT accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :userId];
            Useracc = [
                SELECT accountid, Work_Location__c, UserPro_Type__c
                FROM user
                WHERE id = :userId
            ];
            accountid = Useracc[0].accountid;
            userWorkLocation = Useracc[0].Work_Location__c;
            agencyProType = Useracc[0].UserPro_Type__c;
@@ -183,6 +187,7 @@
        return results;
    }

<<<<<<< HEAD
    public class Results {
        @AuraEnabled
        public String result;
@@ -217,4 +222,41 @@
        @AuraEnabled
        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