From d305df4a23b80b0d0aeeff24a13d6b21331c47cb Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 7 Aug 2024 15:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=8D=95=E9=A1=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=AD=94=E6=A1=88=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/dto/OrderSingle.go | 3 +++ api/model/OrderSingle.go | 1 + 2 files changed, 4 insertions(+) diff --git a/api/dto/OrderSingle.go b/api/dto/OrderSingle.go index f12abe0..597a607 100644 --- a/api/dto/OrderSingle.go +++ b/api/dto/OrderSingle.go @@ -27,6 +27,7 @@ type OrderSingleDto struct { CancelTime *time.Time `json:"cancel_time"` // 订单取消时间 CancelRemarks string `json:"cancel_remarks"` // 取消订单备注 OrderRemarks string `json:"order_remarks"` // 订单备注 + Answer string `json:"answer"` // 算一算答案 CreatedAt model.LocalTime `json:"created_at"` // 创建时间 UpdatedAt model.LocalTime `json:"updated_at"` // 更新时间 Question *QuestionDto `json:"question"` // 问题 @@ -63,6 +64,7 @@ func GetOrderSingleListDto(m []*model.OrderSingle) []*OrderSingleDto { CancelTime: v.CancelTime, CancelRemarks: v.CancelRemarks, OrderRemarks: v.OrderRemarks, + Answer: v.Answer, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, } @@ -106,6 +108,7 @@ func GetOrderSingleDto(m *model.OrderSingle) *OrderSingleDto { CancelTime: m.CancelTime, CancelRemarks: m.CancelRemarks, OrderRemarks: m.OrderRemarks, + Answer: m.Answer, CreatedAt: m.CreatedAt, UpdatedAt: m.UpdatedAt, } diff --git a/api/model/OrderSingle.go b/api/model/OrderSingle.go index 8b7cffd..5f120f6 100644 --- a/api/model/OrderSingle.go +++ b/api/model/OrderSingle.go @@ -26,6 +26,7 @@ type OrderSingle struct { CancelTime *time.Time `gorm:"column:cancel_time;type:datetime;comment:订单取消时间" json:"cancel_time"` CancelRemarks string `gorm:"column:cancel_remarks;type:varchar(255);comment:取消订单备注" json:"cancel_remarks"` OrderRemarks string `gorm:"column:order_remarks;type:varchar(255);comment:订单备注" json:"order_remarks"` + Answer string `gorm:"column:answer;type:varchar(500);comment:算一算答案" json:"answer"` Model Question *Question `gorm:"foreignKey:QuestionId;references:question_id" json:"question"` User *User `gorm:"foreignKey:UserId;references:user_id" json:"user"`