From dbd016a08db9a4461ff91b055039d359f05283ba Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 25 九月 2023 21:31:03 +0800
Subject: [PATCH] 17236461
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
index 23cdbb0..d549790 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
@@ -34,7 +34,7 @@
// 鍘嬬缉鏂囦欢
"rar", "zip", "gz", "bz2",
// 瑙嗛鏍煎紡
- "mp4", "avi", "rmvb",
+ "mp4", "avi", "rmvb", "mp3",
// pdf
"pdf" ,
"apk"};
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
index 2277d46..a7482ba 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -49,6 +49,9 @@
@Excel(name = "瀹犵墿鍝佺")
private String type;
+ @Excel(name = "瀹犵墿绫诲瀷")
+ private String animal;
+
/**
* 瀹犵墿鍚嶇О
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
index c06f6c4..aa42319 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
@@ -19,8 +19,8 @@
/**
* 绫诲埆
*/
-// @Excel(name = "绫诲埆")
-// private String type;
+ @Excel(name = "绫诲埆")
+ private String type;
/**
* 鑾峰緱鏃堕棿
*/
--
Gitblit v1.9.1