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/LexSearchHospitalControllerTest.cls | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/force-app/main/default/classes/LexSearchHospitalControllerTest.cls b/force-app/main/default/classes/LexSearchHospitalControllerTest.cls index 31fc4df..d2b6280 100644 --- a/force-app/main/default/classes/LexSearchHospitalControllerTest.cls +++ b/force-app/main/default/classes/LexSearchHospitalControllerTest.cls @@ -1,17 +1,9 @@ @istest public class LexSearchHospitalControllerTest { @IsTest -<<<<<<< HEAD static void lexSearchHospitalControllerTest1() { -======= - static void lexSearchHospitalControllerTest1(){ ->>>>>>> LEXCommunityLiJun LexSearchHospitalController.init(); LexSearchHospitalController.searchHospital('', ''); LexSearchHospitalController.searchHospital('test', ''); } -<<<<<<< HEAD } -======= -} ->>>>>>> LEXCommunityLiJun -- Gitblit v1.9.1