From c4b9d130cb0aa98f4b65a987b11fc5c2bea3a1c7 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期三, 03 七月 2024 10:37:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian

---
 controllers/location.go |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/controllers/location.go b/controllers/location.go
index ecd21c0..5a4a3f9 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -40,7 +40,7 @@
 		}
 		params.JointName = first.JointName + "/" + params.Name
 		if first.WarehouseId != 0 {
-			params.WarehouseId = first.Id
+			params.WarehouseId = first.WarehouseId
 		} else {
 			//鏍规嵁浠撳簱缂╁啓鏌ヨ浠撳簱
 			houseCode := strings.Split(first.JointName, "/")[0]

--
Gitblit v1.8.0