diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index cd6c810..8f3c82a 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -37,9 +37,6 @@ export function public_studyFormPreList(query) {
     params: query
   })
 }
-<<<<<<< HEAD
-=======
-
 // 试验区域-饲养间列表
 export function public_roomList(query) {
   return request({
@@ -57,4 +54,3 @@ export function public_animalSpeciesList(query) {
     params: query
   })
 }
->>>>>>> 980f3ba (feat:[试验管理][饲养间管理])