From d2e6dff92184f2c6b9cff56ce04e2f11b8494672 Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期四, 13 六月 2024 11:37:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian

---
 response/report_forms_response.go |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index aee3590..5d12343 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -44,12 +44,13 @@
 }
 
 type LocationForms struct {
-	ProduceId       string          `json:"produceId"`       //浜у搧id
-	LocationId      int             `json:"locationId"`      //浣嶇疆id
-	LocationName    string          `json:"locationName"`    //浣嶇疆鍚嶇О
-	ProductName     string          `json:"productName"`     //浜у搧鍚嶇О
-	ProductTypeName string          `json:"productTypeName"` //浜у搧绫诲埆
-	Amount          decimal.Decimal `json:"amount"`          //鏁伴噺
-	Unit            string          `json:"unit"`            //鍗曚綅
-	Value           decimal.Decimal `json:"value"`           //鎬讳环鍊�
+	ProduceId       string             `json:"produceId"`       //浜у搧id
+	LocationId      int                `json:"locationId"`      //浣嶇疆id
+	LocationName    string             `json:"locationName"`    //浣嶇疆鍚嶇О
+	ProductName     string             `json:"productName"`     //浜у搧鍚嶇О
+	ProductTypeName string             `json:"productTypeName"` //浜у搧绫诲埆
+	Amount          decimal.Decimal    `json:"amount"`          //鏁伴噺
+	AmountMoreUnits []models.UnitItems `json:"amountMoreUnits"` //鍦ㄥ簱鏁伴噺澶氬崟浣�
+	Unit            string             `json:"unit"`            //鍗曚綅
+	Value           decimal.Decimal    `json:"value"`           //鎬讳环鍊�
 }

--
Gitblit v1.8.0