From efe7e00821c3ae9ce800411f0debdaef90ee5832 Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Wed, 22 Nov 2023 15:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=9B=BE=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 | 2 +-
server/resource/internal/types/types.go | 2 +-
server_api/resource.api | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/resource/internal/logic/logocombinelogic.go b/server/resource/internal/logic/logocombinelogic.go
index 2a601548..b5e601d2 100644
--- a/server/resource/internal/logic/logocombinelogic.go
+++ b/server/resource/internal/logic/logocombinelogic.go
@@ -104,7 +104,7 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
GuestId: guestId,
TemplateTag: req.TemplateTag,
Website: req.Website,
- Slogan: req.Slogan,
+ Slogan: &req.Slogan,
Phone: req.Phone,
Address: req.Address,
Qrcode: req.Qrcode,
diff --git a/server/resource/internal/types/types.go b/server/resource/internal/types/types.go
index d7d8b473..bf23f3b1 100644
--- a/server/resource/internal/types/types.go
+++ b/server/resource/internal/types/types.go
@@ -38,8 +38,8 @@ type LogoCombineReq struct {
TemplateTagGroups []TemplateTagGroups `json:"template_tag_groups"`
TemplateId int64 `json:"template_id"` // 合图参数
TemplateTag string `json:"template_tag"` // 合图参数
+ Slogan string `json:"slogan,optional"` // 合图参数
Website *string `json:"website,optional"` // 合图参数
- Slogan *string `json:"slogan,optional"` // 合图参数
Address *string `json:"address,optional"` // 合图参数
Phone *string `json:"phone,optional"` // 合图参数
Qrcode *string `json:"qrcode,optional"` // 合图参数
diff --git a/server_api/resource.api b/server_api/resource.api
index 7f600ee0..fdf9a1e7 100644
--- a/server_api/resource.api
+++ b/server_api/resource.api
@@ -70,8 +70,8 @@ type (
TemplateTagGroups []TemplateTagGroups `json:"template_tag_groups"`
TemplateId int64 `json:"template_id"` // 合图参数
TemplateTag string `json:"template_tag"` // 合图参数
+ Slogan string `json:"slogan,optional"` // 合图参数
Website *string `json:"website,optional"` // 合图参数
- Slogan *string `json:"slogan,optional"` // 合图参数
Address *string `json:"address,optional"` // 合图参数
Phone *string `json:"phone,optional"` // 合图参数
Qrcode *string `json:"qrcode,optional"` // 合图参数