Merge remote-tracking branch 'origin/jialian' into jialian

yinbentan

2024-07-03 c4b9d130cb0aa98f4b65a987b11fc5c2bea3a1c7

 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