feat: 冲突

src/store/case.ts

@@ -84,7 +84,6 @@ export const getCaseScenes = (scenes: Scene[]) => {
 export const replaceCaseScenes = (caseId: number, caseScenes: CaseScenes) =>
   axios.post(repCaseScenes, { sceneNumParam: caseScenes, caseId });
 
-<<<<<<< HEAD
 export const caseImgList = (caseId: number, orderBy: string) =>
   axios.post(caseApiList, { orderBy: orderBy || '', caseId });
 
@@ -93,7 +92,6 @@ export const saveOrUpdate = (params: CaseImg) =>
 
 export const caseDel = (id: number) =>
   axios.post(caseApiDel, { id });
-=======
 
 export const getCaseInquestInfo = (caseId: number) =>
   axios.get(caseInquestInfo, { params: { caseId } });
@@ -101,4 +99,3 @@ export const getCaseInquestInfo = (caseId: number) =>
 
 export const saveCaseInquestInfo = (caseId: number, data) =>
   axios.post(caseInquestOpt, { caseId, ...data });
->>>>>>> 8ca77a2d349bd8fbdbd81a69bb09aa16be7dab3e