Merge branch 'CRM_15.6' into debug

models/company/company.go

@@ -1962,6 +1962,6 @@ func GetCompanyListByCondition(condition string, pars []interface{}, fieldArr []
 func GetOverseasCompanys() (items []*Company, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM company where region_type= '海外' `
-	err = o.Raw(sql).QueryRow(&items)
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }