Merge branch 'CRM_14.7.2' into debug

# Conflicts:
#	models/company/company.go

models/company/company.go

@@ -119,6 +119,7 @@ func GetCompanySearchList(condition string, pars []interface{}, limitParam ...in
             GROUP_CONCAT(DISTINCT b.approve_status ORDER BY b.product_id ASC SEPARATOR '/') AS approve_status,
             GROUP_CONCAT(DISTINCT b.freeze_start_date ORDER BY b.product_id ASC SEPARATOR '/') AS freeze_start_date,
             GROUP_CONCAT(DISTINCT b.freeze_end_date ORDER BY b.product_id ASC SEPARATOR '/') AS freeze_end_date,
+            GROUP_CONCAT(DISTINCT b.share_seller_id ORDER BY b.product_id ASC SEPARATOR ',') AS share_seller_ids,
 			GROUP_CONCAT( DISTINCT b.is_signing ORDER BY b.product_id ASC SEPARATOR '/' ) AS signing_status
 			FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id