Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -1,35 +1,16 @@
@isTest
private class LexConsumableAccountInfoControllerTest {
<<<<<<< HEAD
    @isTest
    public static void test_method_one() {
        // Implement test code
        Account account1 = new Account();
        account1.Name = 'test1医院';
=======
	
   @isTest 
   public static void test_method_one() {
      // Implement test code
      Account account1 = new Account();
      account1.Name = 'test1医院';
>>>>>>> LEXCommunityLiJun
        account1.RecordTypeId = '01210000000QemG';
        //account1.Is_Active__c = '草案中';
        insert account1;

<<<<<<< HEAD
        LexConsumableAccountInfoController cai = new LexConsumableAccountInfoController();
        LexConsumableAccountInfoController.init(account1.Id);
        LexConsumableAccountInfoController.init('');
    }
}
=======
	
        LexConsumableAccountInfoController cai = new LexConsumableAccountInfoController();
        LexConsumableAccountInfoController.init(account1.Id);
        LexConsumableAccountInfoController.init('');
   }
	
}
>>>>>>> LEXCommunityLiJun