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

lishihai

2024-06-19 8fcc8d68d295ed80a42c4862f0591cd187df38b7

 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 {