From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts
---
request/location_product_amount.go | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/request/location_product_amount.go b/request/location_product_amount.go
index d4c4e9d..6b34041 100644
--- a/request/location_product_amount.go
+++ b/request/location_product_amount.go
@@ -14,12 +14,13 @@
type UpdateLocationProductAmount struct {
//LocationProductAmountId int `json:"locationProductAmountId"` //搴撳瓨鐩樼偣id
- AdjustAmount decimal.Decimal `json:"adjustAmount" ` //宸��
- DifferenceAmount decimal.Decimal `json:"differenceAmount"` //璁℃暟鏁伴噺
- Amount decimal.Decimal `json:"amount"` //搴撳瓨鏁伴噺
- ProductId string `json:"productId"` //浜у搧id
- OperationId int `json:"operationId"` //鍑哄叆搴搃d
- LocationId int `json:"locationId"` //浣嶇疆id
+ AdjustAmount decimal.Decimal `json:"adjustAmount" ` //宸��
+ DifferenceAmount decimal.Decimal `json:"differenceAmount"` //璁℃暟鏁伴噺
+ Amount decimal.Decimal `json:"amount"` //搴撳瓨鏁伴噺
+ ProductId string `json:"productId"` //浜у搧id
+ OperationId int `json:"operationId"` //鍑哄叆搴搃d
+ LocationId int `json:"locationId"` //浣嶇疆id
+ ProductCategoryId int `json:"productCategoryId"` //浜у搧绉嶇被id
}
type GetRuleList struct {
--
Gitblit v1.8.0