diff --git a/src/api/api/view.ts b/src/api/api/view.ts
index 9abafe1..2458c1b 100644
--- a/src/api/api/view.ts
+++ b/src/api/api/view.ts
@@ -27,9 +27,6 @@ export async function updateBatchById2(params) {
     return result;
 }
 
-<<<<<<< HEAD
-//获取物料视图
-=======
 //试验号变更-保存视图编辑的内容
 export async function updateBatchById3(params) {
     let result = {};
@@ -40,7 +37,6 @@ export async function updateBatchById3(params) {
 }
 
 //获取物理视图
->>>>>>> 0bac140b03041610daed39483d29ac7c4eea0f17
 export async function GetMaterialInfoListByTeamId(params) {
     let result = {};
     await http.post('/api/View/GetMaterialInfoListByTeamId', params).then((data) => {