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

---
 service/location_forms.go |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service/location_forms.go b/service/location_forms.go
index f6cf85b..52d0c9e 100644
--- a/service/location_forms.go
+++ b/service/location_forms.go
@@ -27,7 +27,7 @@
 		resp := new(response.LocationForms)
 		resp.Amount = amount.Amount
 		resp.LocationId = amount.LocationId
-		resp.LocationName = amount.Location.Name
+		resp.LocationName = amount.Location.JointName
 		resp.ProduceId = amount.Product.ID
 		resp.ProductName = amount.Product.Name
 		resp.ProductTypeName = amount.ProductCategory.Name

--
Gitblit v1.8.0