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

yinbentan

2024-07-03 c4b9d130cb0aa98f4b65a987b11fc5c2bea3a1c7

 models/location.go

@@ -156,6 +156,7 @@
      db = db.Where("company_id=?", slf.CompanyId)
   }
   if slf.JointName != "" {
      slf.JointName += "/"
      db = db.Where("joint_name like ?", slf.JointName+"%")
   }
   if len(slf.JointNames) != 0 {