From e1682682e5b962a01bd623a1571fbf3f0f8a6280 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 23 Aug 2022 16:18:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86):=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=A8=A1=E7=89=88=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8excel=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 6 ++++++ .../io/dataease/plugins/server/XUserServer.java | 1 + backend/src/main/resources/excel/user.xls | Bin 0 -> 19456 bytes 3 files changed, 7 insertions(+) create mode 100644 backend/src/main/resources/excel/user.xls diff --git a/backend/pom.xml b/backend/pom.xml index da52fa1f95..ced25a53f6 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -377,6 +377,12 @@ org.apache.maven.plugins maven-resources-plugin 3.1.0 + + UTF-8 + + xls + + org.springframework.boot diff --git a/backend/src/main/java/io/dataease/plugins/server/XUserServer.java b/backend/src/main/java/io/dataease/plugins/server/XUserServer.java index 00fe1961c8..38692b88a6 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XUserServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XUserServer.java @@ -14,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; + @Api(tags = "xpack:用户导入") @RequestMapping("/plugin/user") @RestController diff --git a/backend/src/main/resources/excel/user.xls b/backend/src/main/resources/excel/user.xls new file mode 100644 index 0000000000000000000000000000000000000000..96e7fd1e0128e9f35b55a32869f677beace57642 GIT binary patch literal 19456 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 K&;8$Sf&T$@AE(9u literal 0 HcmV?d00001