From 9b09a33f47f87fbabc7bc7695fe73a9c9cce4e53 Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Wed, 11 Oct 2023 15:13:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=AE=97=E6=B3=95=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/internal/logic/logocombinelogic.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/resource/internal/logic/logocombinelogic.go b/server/resource/internal/logic/logocombinelogic.go
index a507f3f0..de3367cc 100644
--- a/server/resource/internal/logic/logocombinelogic.go
+++ b/server/resource/internal/logic/logocombinelogic.go
@@ -124,8 +124,10 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 
 	// 返回成功的响应和上传URL
 	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
-		"resource_id":       res.ResourceId,
-		"resource_url":      res.ResourceUrl,
-		"resource_metadata": "",
+		"resource_id":            res.ResourceId,
+		"resource_url":           res.ResourceUrl,
+		"resource_metadata":      "",
+		"diff_time_logo_combine": res.DiffTimeLogoCombine,
+		"diff_time_upload_file":  res.DiffTimeUploadFile,
 	})
 }