From 63f0b20fd6b557caf4c1390befbad0d539539be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Thu, 29 Sep 2022 10:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseController/BaseExcelController.cs | 2 +- .../Temp/202209290934571682T_DataExport.xlsx | Bin 0 -> 4612 bytes .../Temp/202209290956277335T_DataExport.xlsx | Bin 0 -> 4612 bytes Yi.Vue3.X.RuoYi/src/views/system/user/index.vue | 8 ++++---- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202209290934571682T_DataExport.xlsx create mode 100644 Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202209290956277335T_DataExport.xlsx diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs index 81bdee27..a91e85b2 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs @@ -60,7 +60,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [HttpPost] [AllowAnonymous] - public async Task Import(IFormFile formFile) + public async Task Import([FromForm(Name = "file")]IFormFile formFile) { List datas = ExcelHelper.ImportData(formFile.OpenReadStream()); diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202209290934571682T_DataExport.xlsx b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202209290934571682T_DataExport.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2052611ed6e2f2cfe006fd2ab65fe675e9e45cea GIT binary patch literal 4612 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 Tg-`J7JtExsYxB~{e?9#V{26P_ literal 0 HcmV?d00001 diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue index f3b8fd66..3a6e781e 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue @@ -207,7 +207,7 @@ @@ -215,9 +215,9 @@
将文件拖到此处,或点击上传