Merge branch 'sxy' into dev

This commit is contained in:
孙肖扬 2025-03-17 10:44:31 +08:00
commit 95c1423d69

View File

@ -15,6 +15,7 @@ import (
"github.com/exhibition-main/internal/model"
"github.com/exhibition-main/internal/msg"
"github.com/exhibition-main/internal/response"
"github.com/exhibition-main/pkg/logic"
"github.com/exhibition-main/pkg/service/common"
"github.com/exhibition-main/pkg/utils"
"github.com/gin-gonic/gin"
@ -205,11 +206,11 @@ func ExportRegister(c *gin.Context) {
return
}
//处理图片
// err = logic.DealExcelImg(filePath)
// if err != nil {
// response.ResponseQuickMsg(c, msg.Fail, err.Error(), nil)
// return
// }
err = logic.DealExcelImg(filePath)
if err != nil {
response.ResponseQuickMsg(c, msg.Fail, err.Error(), nil)
return
}
var httpType string
if config.Data.System.Mode == "prod" {
httpType = model.HttpsType