From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls b/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls
index 20985d0..3b43a92 100644
--- a/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls
+++ b/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls
@@ -1,19 +1,35 @@
@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('');
}
-}
\ No newline at end of file
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1