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
---
proto/product_inventory/server.go | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/proto/product_inventory/server.go b/proto/product_inventory/server.go
index bb375e1..28310a3 100644
--- a/proto/product_inventory/server.go
+++ b/proto/product_inventory/server.go
@@ -167,6 +167,10 @@
}
operation.ToLocationID = first.Id
operation.BaseOperationType = constvar.BaseOperationTypeOutgoing
+ operation.ReceiverName = req.Addressee
+ operation.ReceiverPhone = req.Phone
+ operation.ReceiverAddr = req.Address
+ operation.Source = req.Source
if req.DeliverType == 1 {
for _, product := range req.ProductList {
var detail models.OperationDetails
--
Gitblit v1.8.0