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.proto | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/proto/product_inventory.proto b/proto/product_inventory.proto
index 7da35cb..4c6552f 100644
--- a/proto/product_inventory.proto
+++ b/proto/product_inventory.proto
@@ -14,7 +14,8 @@
string Address = 3;//鏀惰揣鍦板潃
string Phone = 4;
int32 DeliverType = 5;//浜や粯绫诲瀷
- repeated InventoryProduct ProductList = 6;
+ string Source = 6;
+ repeated InventoryProduct ProductList = 7;
}
message InventoryProduct{
--
Gitblit v1.8.0