From 469adfb91f75988e8971f2ee0b6d73e39cb31c48 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 7 Jan 2026 17:12:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=BB=84=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/public/public.js | 4 ----
 1 file changed, 4 deletions(-)

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:[试验管理][饲养间管理])