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/LexSearchHospitalControllerTest.cls | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexSearchHospitalControllerTest.cls b/force-app/main/default/classes/LexSearchHospitalControllerTest.cls
index d2b6280..31fc4df 100644
--- a/force-app/main/default/classes/LexSearchHospitalControllerTest.cls
+++ b/force-app/main/default/classes/LexSearchHospitalControllerTest.cls
@@ -1,9 +1,17 @@
@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