Merge branch 'develop' into feature/websocket

2023-10-11 15:22:48 +08:00
parent 9627cc12bf 9b09a33f47
commit 8e11157c92
4 changed files with 25 additions and 18 deletions
--- 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,
 	})
 }