From 597de080f7597e59eee571d43f8f90cb5ce86092 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期一, 20 十一月 2023 16:04:48 +0800 Subject: [PATCH] 解决冲突,合并代码 --- response/report_forms_response.go | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/response/report_forms_response.go b/response/report_forms_response.go index 200903d..4a60e50 100644 --- a/response/report_forms_response.go +++ b/response/report_forms_response.go @@ -29,6 +29,10 @@ ContactedName string `json:"contactedName"` //瀹屾垚鑰� Status string `json:"status"` //鐘舵�� BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷 + Weight decimal.Decimal `json:"weight"` //閲嶉噺 + ProductId string `json:"productId"` + FromLocationId int `json:"fromLocationId"` + ToLocationId int `json:"toLocationId"` } type LocationForms struct { -- Gitblit v1.8.0