Merge pull request #3636 from dataease/dev

merge dev
2022-11-03 17:06:40 +08:00 · 2022-11-03 17:06:40 +08:00 · 0a1c08d803
commit 0a1c08d803
parent 185866d684 77fac8f684
3 changed files with 1 additions and 1 deletions
--- a/backend/pom.xml
+++ b/backend/pom.xml
@ -378,7 +378,7 @@
                <configuration>
                    <encoding>UTF-8</encoding>
                    <nonFilteredFileExtensions>
-                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
                    </nonFilteredFileExtensions>
                </configuration>
            </plugin>
--- a/backend/src/main/resources/excel/user.xls
+++ b/backend/src/main/resources/excel/user.xls
--- a/backend/src/main/resources/excel/user.xlsx
+++ b/backend/src/main/resources/excel/user.xlsx