From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/api/resource/file.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/resource/file.js b/Source/UBCS-WEB/src/api/resource/file.js
index e9d0482..ef26a06 100644
--- a/Source/UBCS-WEB/src/api/resource/file.js
+++ b/Source/UBCS-WEB/src/api/resource/file.js
@@ -40,14 +40,9 @@
return request({
url: '/api/ubcs-resource/fileController/downloadFilesByOids',
method: 'post',
-<<<<<<< HEAD
- // headers:{'Content-Type':'application/x-www-form-urlencoded'},
- params: fileOids
-=======
headers:{'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'},
data: data
->>>>>>> 3e35833e70a7532d4ae8da0dcd905627230f2b2c
})
}
--
Gitblit v1.9.3