From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/platform/src/main/java/com/doumee/api/common/PublicController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/api/common/PublicController.java b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
index 990ab93..93a4120 100644
--- a/server/platform/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.TypeReference;
 import com.doumee.api.BaseController;
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelToPdfTool;
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
@@ -176,6 +177,7 @@
                         type =1;
                     }else if(StringUtils.endsWith(key,".jpg")
                             || StringUtils.endsWith(key,".JPG")
+                            || StringUtils.endsWith(key,".png")
                             || StringUtils.endsWith(key,".PNG")
                             || StringUtils.endsWith(key,".jpeg")
                             || StringUtils.endsWith(key,".JPEG")){

--
Gitblit v1.9.3