短信发送

src/api/caseManagement/caseManagement.js

@@ -34,7 +34,6 @@ export function getFileList(data) {
 }
 /** 批量上传证据 */
 export function batchUpload(data) {
-<<<<<<< HEAD
   return request({
     url: "/caseApplication/batchUpload",
     method: "post",
@@ -246,20 +245,4 @@ export function getIdType() {
     url: '/system/dict/data/type/id_type',
     method: 'get',
   })
-}
-=======
-    return request({
-        url: "/caseApplication/batchUpload",
-        method: "post",
-        data: data,
-    });
-}
-// 提交 
-export function submitCaseApply(data) {
-    return request({
-      url: '/caseApplication/submit',
-      method: 'post',
-      data: data
-    })
-  }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
+}